summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-rename.c
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/cluster/dht/src/dht-rename.c')
-rw-r--r--xlators/cluster/dht/src/dht-rename.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c
index 3120db218eb..037f8731fcf 100644
--- a/xlators/cluster/dht/src/dht-rename.c
+++ b/xlators/cluster/dht/src/dht-rename.c
@@ -442,8 +442,9 @@ dht_rename_cleanup (call_frame_t *frame)
if (dst_hashed != src_hashed && dst_hashed != src_cached)
call_cnt++;
- if (src_cached != dst_hashed)
+ if (local->added_link && (src_cached != dst_hashed)) {
call_cnt++;
+ }
local->call_cnt = call_cnt;
@@ -475,7 +476,7 @@ dht_rename_cleanup (call_frame_t *frame)
xattr_new = NULL;
}
- if (src_cached != dst_hashed) {
+ if (local->added_link && (src_cached != dst_hashed)) {
dict_t *xattr_new = NULL;
gf_msg_trace (this->name, 0,
@@ -790,8 +791,12 @@ dht_rename_links_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
"link/file on %s failed (%s)",
prev->this->name, strerror (op_errno));
local->op_ret = -1;
- if (op_errno != ENOENT)
+ if (op_errno != ENOENT) {
local->op_errno = op_errno;
+ if (prev->this == local->src_cached) {
+ local->added_link = _gf_false;
+ }
+ }
} else if (local->src_cached == prev->this) {
/* merge of attr returned only from linkfile creation */
dht_iatt_merge (this, &local->stbuf, stbuf, prev->this);
@@ -927,6 +932,7 @@ dht_rename_create_links (call_frame_t *frame)
DHT_MARKER_DONT_ACCOUNT(xattr_new);
}
+ local->added_link = _gf_true;
STACK_WIND (frame, dht_rename_links_cbk,
src_cached, src_cached->fops->link,
&local->loc, &local->loc2, xattr_new);