remove 'gen' from iatt/protocol structures

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971

8 files changed, 8 insertions, 33 deletions

diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index cb01f0b9c32..9135e84ed0f 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -641,7 +641,6 @@ afr_lookup_done (call_frame_t *frame, xlator_t *this, struct iatt *lookup_buf)
 
         if (local->cont.lookup.ino) {
                 local->cont.lookup.buf.ia_ino = local->cont.lookup.ino;
-                local->cont.lookup.buf.ia_gen = local->cont.lookup.gen;
         }
 
         up_count = afr_up_children_count (priv->child_count, priv->child_up);
@@ -812,7 +811,6 @@ afr_fresh_lookup_cbk (call_frame_t *frame, void *cookie,
                                 afr_itransform (buf->ia_ino,
                                                 priv->child_count,
                                                 first_up_child);
-                        local->cont.lookup.gen = buf->ia_gen;
                 }
 
 		if (local->success_count == 0) {
@@ -937,7 +935,6 @@ afr_revalidate_lookup_cbk (call_frame_t *frame, void *cookie,
                                 afr_itransform (buf->ia_ino,
                                                 priv->child_count,
                                                 first_up_child);
-                        local->cont.lookup.gen = buf->ia_gen;
                 }
 
 		/* in case of revalidate, we need to send stat of the
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c
index 5d5bf40e06a..912dde32743 100644
--- a/xlators/cluster/afr/src/afr-dir-write.c
+++ b/xlators/cluster/afr/src/afr-dir-write.c
@@ -99,7 +99,6 @@ afr_create_unwind (call_frame_t *frame, xlator_t *this)
                 }
 
                 unwind_buf->ia_ino = local->cont.create.ino;
-                unwind_buf->ia_gen = local->cont.create.gen;
 
                 local->cont.create.preparent.ia_ino  = local->cont.create.parent_ino;
                 local->cont.create.postparent.ia_ino = local->cont.create.parent_ino;
@@ -177,7 +176,6 @@ afr_create_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         afr_itransform (buf->ia_ino,
                                                         priv->child_count,
                                                         child_index);
-                                local->cont.create.gen = buf->ia_gen;
 
                                 if (priv->read_child >= 0) {
                                         afr_set_read_child (this, inode, 
@@ -193,7 +191,6 @@ afr_create_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         afr_itransform (buf->ia_ino,
                                                         priv->child_count,
                                                         local->first_up_child);
-                                local->cont.create.gen = buf->ia_gen;
                         }
                         
                         if (child_index == local->read_child_index) {
@@ -388,7 +385,6 @@ afr_mknod_unwind (call_frame_t *frame, xlator_t *this)
                 }
 
                 unwind_buf->ia_ino = local->cont.mknod.ino;
-                unwind_buf->ia_gen = local->cont.mknod.gen;
 
                 local->cont.mknod.preparent.ia_ino  = local->cont.mknod.parent_ino;
                 local->cont.mknod.postparent.ia_ino = local->cont.mknod.parent_ino;
@@ -435,7 +431,6 @@ afr_mknod_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 					afr_itransform (buf->ia_ino,
 							priv->child_count,
 							child_index);
-                                local->cont.mknod.gen   = buf->ia_gen;
 
                                 if (priv->read_child >= 0) {
                                         afr_set_read_child (this, inode,
@@ -451,7 +446,6 @@ afr_mknod_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         afr_itransform (buf->ia_ino,
                                                         priv->child_count,
                                                         local->first_up_child);
-                                local->cont.mknod.gen = buf->ia_gen;
                         }
 
                         if (child_index == local->read_child_index) {
@@ -641,7 +635,6 @@ afr_mkdir_unwind (call_frame_t *frame, xlator_t *this)
                 }
 
                 unwind_buf->ia_ino = local->cont.mkdir.ino;
-                unwind_buf->ia_gen = local->cont.mkdir.gen;
 
                 local->cont.mkdir.preparent.ia_ino  = local->cont.mkdir.parent_ino;
                 local->cont.mkdir.postparent.ia_ino = local->cont.mkdir.parent_ino;
@@ -689,7 +682,6 @@ afr_mkdir_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         afr_itransform (buf->ia_ino,
                                                         priv->child_count,
                                                         child_index);
-                                local->cont.mkdir.gen = buf->ia_gen;
 
                                 if (priv->read_child >= 0) {
                                         afr_set_read_child (this, inode,
@@ -705,7 +697,6 @@ afr_mkdir_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         afr_itransform (buf->ia_ino,
                                                         priv->child_count,
                                                         local->first_up_child);
-                                local->cont.mkdir.gen = buf->ia_gen;
                         }
                         
                         if (child_index == local->read_child_index) {
@@ -1133,7 +1124,6 @@ afr_symlink_unwind (call_frame_t *frame, xlator_t *this)
                 }
 
                 unwind_buf->ia_ino = local->cont.symlink.ino;
-                unwind_buf->ia_gen = local->cont.symlink.gen;
 
                 local->cont.symlink.preparent.ia_ino  = local->cont.symlink.parent_ino;
                 local->cont.symlink.postparent.ia_ino = local->cont.symlink.parent_ino;
@@ -1179,7 +1169,6 @@ afr_symlink_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 				local->cont.symlink.ino = 
 					afr_itransform (buf->ia_ino, priv->child_count,
 							child_index);
-                                local->cont.symlink.gen = buf->ia_gen;
 
                                 if (priv->read_child >= 0) {
                                         afr_set_read_child (this, inode,
@@ -1195,7 +1184,6 @@ afr_symlink_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                         afr_itransform (buf->ia_ino,
                                                         priv->child_count,
                                                         local->first_up_child);
-                                local->cont.symlink.gen = buf->ia_gen;
                         }
 
                         if (child_index == local->read_child_index) {
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;
diff --git a/xlators/debug/trace/src/trace.c b/xlators/debug/trace/src/trace.c
index 32a3869e6df..f5af77681a9 100644
--- a/xlators/debug/trace/src/trace.c
+++ b/xlators/debug/trace/src/trace.c
@@ -82,11 +82,11 @@ trace_stat_to_str (struct iatt *stbuf)
                   localtime ((time_t *)&ia_time));
 
         asprint_ret_value = gf_asprintf (&statstr,
-                                      "ia_ino=%"PRIu64", ia_gen=%"PRIu64
+                                      "ia_ino=%"PRIu64
                                       ", st_mode=%o, ia_nlink=%"GF_PRI_NLINK", "
                                       "ia_uid=%d, ia_gid=%d, ia_size=%"PRId64", ia_blocks=%"PRId64
                                       ", ia_atime=%s, ia_mtime=%s, ia_ctime=%s",
-                                      stbuf->ia_ino, stbuf->ia_gen,
+                                      stbuf->ia_ino,
                                       st_mode_from_ia (stbuf->ia_prot, stbuf->ia_type),
                                       stbuf->ia_nlink, stbuf->ia_uid,
                                       stbuf->ia_gid, stbuf->ia_size,
@@ -182,12 +182,12 @@ trace_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                   localtime ((time_t *)&ia_time));
 
                         gf_log (this->name, GF_LOG_NORMAL,
-                                "%"PRId64": (op_ret=%d, buf {ia_gen=%"PRIu64", "
+                                "%"PRId64": (op_ret=%d, buf {"
                                 "ia_ino=%"PRIu64", st_mode=%o, ia_nlink=%"GF_PRI_NLINK", "
                                 "ia_uid=%d, ia_gid=%d, ia_rdev=%"PRIu64", ia_size=%"PRId64
                                 ", ia_blksize=%"GF_PRI_BLKSIZE", ia_blocks=%"PRId64", "
                                 "ia_atime=%s, ia_mtime=%s, ia_ctime=%s})",
-                                frame->root->unique, op_ret, buf->ia_gen, buf->ia_ino,
+                                frame->root->unique, op_ret, buf->ia_ino,
                                 st_mode_from_ia (buf->ia_prot, buf->ia_type),
                                 buf->ia_nlink, buf->ia_uid, buf->ia_gid,
                                 buf->ia_rdev, buf->ia_size, buf->ia_blksize,
@@ -229,12 +229,12 @@ trace_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                   localtime ((time_t *)&ia_time));
 
                         gf_log (this->name, GF_LOG_NORMAL,
-                                "%"PRId64": (op_ret=%d, op_errno=%d, *buf {ia_gen=%"PRIu64", "
+                                "%"PRId64": (op_ret=%d, op_errno=%d, *buf {"
                                 "ia_ino=%"PRIu64", st_mode=%o, ia_nlink=%"GF_PRI_NLINK", "
                                 "ia_uid=%d, ia_gid=%d, ia_rdev=%"PRIu64", "
                                 "ia_size=%"PRId64", ia_blksize=%"GF_PRI_BLKSIZE", "
                                 "ia_blocks=%"PRId64", ia_atime=%s, ia_mtime=%s, ia_ctime=%s})",
-                                frame->root->unique, op_ret, op_errno, buf->ia_gen, buf->ia_ino,
+                                frame->root->unique, op_ret, op_errno, buf->ia_ino,
                                 st_mode_from_ia (buf->ia_prot, buf->ia_type),
                                 buf->ia_nlink, buf->ia_uid, buf->ia_gid,
                                 buf->ia_rdev, buf->ia_size, buf->ia_blksize, buf->ia_blocks,
@@ -1097,12 +1097,12 @@ trace_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                                   localtime ((time_t *)&ia_time));
 
                         gf_log (this->name, GF_LOG_NORMAL,
-                                "%"PRId64": (op_ret=%d, *buf {ia_gen=%"PRIu64", "
+                                "%"PRId64": (op_ret=%d, *buf {"
                                 "ia_ino=%"PRIu64", st_mode=%o, ia_nlink=%"GF_PRI_NLINK", "
                                 "ia_uid=%d, ia_gid=%d, ia_rdev=%"PRIu64", ia_size=%"PRId64", "
                                 "ia_blksize=%"GF_PRI_BLKSIZE", ia_blocks=%"PRId64", ia_atime=%s, "
                                 "ia_mtime=%s, ia_ctime=%s})",
-                                frame->root->unique, op_ret, buf->ia_gen, buf->ia_ino,
+                                frame->root->unique, op_ret, buf->ia_ino,
                                 st_mode_from_ia (buf->ia_prot, buf->ia_type),
                                 buf->ia_nlink, buf->ia_uid, buf->ia_gid,
                                 buf->ia_rdev, buf->ia_size, buf->ia_blksize,
diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c
index 9ccfb07ca40..0fa254b7e78 100644
--- a/xlators/nfs/server/src/nfs3-helpers.c
+++ b/xlators/nfs/server/src/nfs3-helpers.c
@@ -743,14 +743,12 @@ nfs3_funge_root_dotdot_dirent (gf_dirent_t *ent, struct nfs3_fh *dfh)
             nfs3_is_parentdir_entry (ent->d_name)) {
                 ent->d_ino = 1;
                 ent->d_stat.ia_ino = 1;
-                ent->d_stat.ia_gen = 0;
         }
 
         if (nfs3_fh_is_root_fh (dfh) &&
             nfs3_is_dot_entry (ent->d_name)) {
                 ent->d_ino = 1;
                 ent->d_stat.ia_ino = 1;
-                ent->d_stat.ia_gen = 0;
         }
 
 }
diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c
index 6c63ef6faac..5be50475719 100644
--- a/xlators/protocol/server/src/server3_1-fops.c
+++ b/xlators/protocol/server/src/server3_1-fops.c
@@ -5021,7 +5021,6 @@ server_statfs (rpcsvc_request_t *req)
 
         state->resolve.type   = RESOLVE_MUST;
         memcpy (state->resolve.gfid, args.gfid, 16);
-        state->resolve.gen    = args.gen;
         state->resolve.path   = gf_strdup (args.path);
 
         resolve_and_resume (frame, server_statfs_resume);