diff options
Diffstat (limited to 'xlators/cluster')
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 18 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-write.c | 3 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-entry.c | 2 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 3 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 5 |
5 files changed, 30 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 5c8a8105d30..2b24522f5d9 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -492,6 +492,16 @@ afr_up_children_count (int child_count, unsigned char *child_up) return ret; } +void +afr_update_loc_gfids (loc_t *loc, struct iatt *buf, struct iatt *postparent) +{ + GF_ASSERT (loc); + GF_ASSERT (buf); + + uuid_copy (loc->gfid, buf->ia_gfid); + if (postparent) + uuid_copy (loc->pargfid, postparent->ia_gfid); +} ino64_t afr_itransform (ino64_t ino, int child_count, int child_index) @@ -887,6 +897,10 @@ afr_fresh_lookup_cbk (call_frame_t *frame, void *cookie, *lookup_buf = *buf; + uuid_copy (local->loc.gfid, buf->ia_gfid); + uuid_copy (local->loc.pargfid, + postparent->ia_gfid); + lookup_buf->ia_ino = afr_itransform (buf->ia_ino, priv->child_count, child_index); @@ -916,6 +930,10 @@ afr_fresh_lookup_cbk (call_frame_t *frame, void *cookie, local->cont.lookup.postparent = *postparent; *lookup_buf = *buf; + + uuid_copy (local->loc.gfid, buf->ia_gfid); + uuid_copy (local->loc.pargfid, + postparent->ia_gfid); } } diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index af42e7e06a0..1f2b58f4d25 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -69,6 +69,9 @@ afr_build_parent_loc (loc_t *parent, loc_t *child) parent->inode = inode_ref (child->parent); parent->parent = inode_parent (parent->inode, 0, NULL); parent->ino = parent->inode->ino; + + if (!uuid_is_null (child->pargfid)) + uuid_copy (parent->gfid, child->pargfid); } /* {{{ create */ diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c index 0c9fca49572..818f688e558 100644 --- a/xlators/cluster/afr/src/afr-self-heal-entry.c +++ b/xlators/cluster/afr/src/afr-self-heal-entry.c @@ -1574,6 +1574,8 @@ afr_sh_entry_impunge_recreate_lookup_cbk (call_frame_t *impunge_frame, impunge_sh->parentbuf = *postparent; impunge_local->cont.lookup.buf = *buf; + afr_update_loc_gfids (&impunge_local->loc, buf, postparent); + type = buf->ia_type; switch (type) { diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 7bd24e0ac6e..e4205ae9172 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -735,6 +735,9 @@ afr_build_parent_loc (loc_t *parent, loc_t *child); int afr_up_children_count (int child_count, unsigned char *child_up); +void +afr_update_loc_gfids (loc_t *loc, struct iatt *buf, struct iatt *postparent); + int afr_locked_nodes_count (unsigned char *locked_nodes, int child_count); diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index e101b2b0900..112d4231dc3 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -149,7 +149,6 @@ dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, (prev->this == dht_first_up_subvol (this))) { local->ia_ino = local->stbuf.ia_ino; } - } unlock: UNLOCK (&frame->lock); @@ -3771,6 +3770,8 @@ dht_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, local->ia_ino = local->stbuf.ia_ino; } + if (uuid_is_null (local->loc.gfid) && !op_ret) + uuid_copy (local->loc.gfid, stbuf->ia_gfid); } unlock: UNLOCK (&frame->lock); @@ -3828,6 +3829,8 @@ dht_mkdir_hashed_cbk (call_frame_t *frame, void *cookie, local->call_cnt = conf->subvolume_cnt - 1; if (local->call_cnt == 0) { + if (uuid_is_null (local->loc.gfid) && !op_ret) + uuid_copy (local->loc.gfid, stbuf->ia_gfid); dht_selfheal_directory (frame, dht_mkdir_selfheal_cbk, &local->loc, layout); } |