diff options
Diffstat (limited to 'xlators/cluster/dht/src/dht-rename.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-rename.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index 35fedeaa7a4..7685ad88427 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -378,8 +378,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; @@ -395,10 +396,11 @@ dht_rename_cleanup (call_frame_t *frame) &local->loc, 0, NULL); } - if (src_cached != dst_hashed) { + if (local->added_link && (src_cached != dst_hashed)) { gf_log (this->name, GF_LOG_TRACE, "unlinking link %s => %s (%s)", local->loc.path, local->loc2.path, src_cached->name); + STACK_WIND (frame, dht_rename_unlink_cbk, src_cached, src_cached->fops->unlink, &local->loc2, 0, NULL); @@ -652,9 +654,15 @@ 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; - } else { + + 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); } @@ -767,6 +775,8 @@ dht_rename_create_links (call_frame_t *frame) gf_log (this->name, GF_LOG_TRACE, "link %s => %s (%s)", local->loc.path, local->loc2.path, src_cached->name); + + local->added_link = _gf_true; STACK_WIND (frame, dht_rename_links_cbk, src_cached, src_cached->fops->link, &local->loc, &local->loc2, NULL); |