From 8e068b0615859829ac1bb2351b78307b2b496cdc Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Tue, 14 Sep 2010 07:40:11 +0000 Subject: remove 'gen' from iatt/protocol structures Signed-off-by: Amar Tumballi Signed-off-by: Vijay Bellur BUG: 971 (dynamic volume management) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971 --- xlators/cluster/dht/src/dht-common.c | 5 ----- xlators/cluster/dht/src/dht-common.h | 1 - xlators/cluster/dht/src/dht-helper.c | 1 - 3 files changed, 7 deletions(-) (limited to 'xlators/cluster/dht') diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 24430e6bcb4..6f818ea024d 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -142,7 +142,6 @@ dht_lookup_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (prev->this == dht_first_up_subvol (this)) { local->ia_ino = local->stbuf.ia_ino; - local->ia_gen = local->stbuf.ia_gen; } } @@ -173,7 +172,6 @@ unlock: if (local->ia_ino) { local->stbuf.ia_ino = local->ia_ino; - local->stbuf.ia_gen = local->ia_gen; } else { gf_log (this->name, GF_LOG_DEBUG, "could not find hashed subvol for %s", @@ -3367,7 +3365,6 @@ dht_mkdir_selfheal_cbk (call_frame_t *frame, void *cookie, if (op_ret == 0) { dht_layout_set (this, local->inode, layout); local->stbuf.ia_ino = local->ia_ino; - local->stbuf.ia_gen = local->ia_gen; if (local->loc.parent) { local->preparent.ia_ino = local->loc.parent->ino; local->postparent.ia_ino = local->loc.parent->ino; @@ -3425,7 +3422,6 @@ dht_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (prev->this == dht_first_up_subvol (this)) { local->ia_ino = local->stbuf.ia_ino; - local->ia_gen = local->stbuf.ia_gen; } } @@ -3479,7 +3475,6 @@ dht_mkdir_hashed_cbk (call_frame_t *frame, void *cookie, dht_iatt_merge (this, &local->postparent, postparent, prev->this); local->ia_ino = local->stbuf.ia_ino; - local->ia_gen = local->stbuf.ia_gen; local->call_cnt = conf->subvolume_cnt - 1; diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index 58edca9f66c..0d028a2e542 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -87,7 +87,6 @@ struct dht_local { dht_layout_t *layout; size_t size; ino_t ia_ino; - ino_t ia_gen; xlator_t *src_hashed, *src_cached; xlator_t *dst_hashed, *dst_cached; xlator_t *cached_subvol; diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index 804685b65ba..147cd0fe7dc 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -420,7 +420,6 @@ dht_iatt_merge (xlator_t *this, struct iatt *to, uuid_copy (to->ia_gfid, from->ia_gfid); dht_itransform (this, subvol, from->ia_ino, &to->ia_ino); - to->ia_gen = from->ia_gen; to->ia_prot = from->ia_prot; to->ia_type = from->ia_type; -- cgit