From 5522ac20241436be6a005058b6360f4339eb678c Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Fri, 10 Jun 2011 02:50:18 +0000 Subject: loc_t: add 'gfid' and 'pargfid' fields these fields are used mainly in case of selfheal path, where 'inode->gfid'||'parent->gfid' is not yet set. These fields in 'loc' will have lower precedence than 'inode->gfid' in client protocol. also contains 'Pranith 's patch to set proper loc->gfid during afr selfheal Signed-off-by: Amar Tumballi Signed-off-by: Anand Avati BUG: 2346 (Log message enhancements in GlusterFS - phase 1) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2346 --- xlators/cluster/afr/src/afr-common.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'xlators/cluster/afr/src/afr-common.c') diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index ef070a188f7..aa88d609837 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -509,6 +509,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) @@ -906,6 +916,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); @@ -935,6 +949,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); } } -- cgit