From e4c5ad45612e845eb476b29d51ec12b963660855 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Wed, 30 Mar 2011 00:03:59 +0000 Subject: cluster/dht: send back the proper inode number in the cbk functions Signed-off-by: Amar Tumballi Signed-off-by: Vijay Bellur BUG: 2584 (Inode number changes on a directory when one of subvolumes is down in replicate) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2584 --- xlators/cluster/dht/src/dht-common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xlators') diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index fe46d3fcd06..6a8455b5126 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -221,7 +221,8 @@ dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, dht_iatt_merge (this, &local->postparent, postparent, prev->this); - if (prev->this == dht_first_up_subvol (this)) { + if (!local->ia_ino && + (prev->this == dht_first_up_subvol (this))) { local->ia_ino = local->stbuf.ia_ino; } @@ -1163,6 +1164,8 @@ dht_lookup (call_frame_t *frame, xlator_t *this, goto err; } + local->ia_ino = loc->inode->ino; + if (layout->gen && (layout->gen < conf->gen)) { gf_log (this->name, GF_LOG_TRACE, "incomplete layout failure for path=%s", @@ -1174,7 +1177,6 @@ dht_lookup (call_frame_t *frame, xlator_t *this, } local->inode = inode_ref (loc->inode); - local->ia_ino = loc->inode->ino; local->call_cnt = 1; call_cnt = local->call_cnt; -- cgit