summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libglusterfs/src/iatt.h5
-rw-r--r--rpc/xdr/src/glusterfs3-xdr.c90
-rw-r--r--rpc/xdr/src/glusterfs3-xdr.h45
-rw-r--r--rpc/xdr/src/glusterfs3.x43
-rw-r--r--xlators/cluster/afr/src/afr-common.c3
-rw-r--r--xlators/cluster/afr/src/afr-dir-write.c12
-rw-r--r--xlators/cluster/dht/src/dht-common.c5
-rw-r--r--xlators/cluster/dht/src/dht-common.h1
-rw-r--r--xlators/cluster/dht/src/dht-helper.c1
-rw-r--r--xlators/debug/trace/src/trace.c16
-rw-r--r--xlators/nfs/server/src/nfs3-helpers.c2
-rw-r--r--xlators/protocol/server/src/server3_1-fops.c1
12 files changed, 8 insertions, 216 deletions
diff --git a/libglusterfs/src/iatt.h b/libglusterfs/src/iatt.h
index e67d714c2..390a3c38b 100644
--- a/libglusterfs/src/iatt.h
+++ b/libglusterfs/src/iatt.h
@@ -59,7 +59,6 @@ typedef struct {
struct iatt {
uint64_t ia_ino; /* inode number */
- uint64_t ia_gen; /* generation number */
uuid_t ia_gfid;
uint64_t ia_dev; /* backing device ID */
ia_type_t ia_type; /* type of file */
@@ -259,8 +258,6 @@ iatt_from_stat (struct iatt *iatt, struct stat *stat)
iatt->ia_dev = stat->st_dev;
iatt->ia_ino = stat->st_ino;
- (void) iatt->ia_gen;
-
iatt->ia_type = ia_type_from_st_mode (stat->st_mode);
iatt->ia_prot = ia_prot_from_st_mode (stat->st_mode);
@@ -294,8 +291,6 @@ iatt_to_stat (struct iatt *iatt, struct stat *stat)
stat->st_dev = iatt->ia_dev;
stat->st_ino = iatt->ia_ino;
- (void) iatt->ia_gen;
-
stat->st_mode = st_mode_from_ia (iatt->ia_prot, iatt->ia_type);
stat->st_nlink = iatt->ia_nlink;
diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c
index 475a1abed..d95958dc9 100644
--- a/rpc/xdr/src/glusterfs3-xdr.c
+++ b/rpc/xdr/src/glusterfs3-xdr.c
@@ -81,8 +81,6 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->ia_gen))
- return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ia_dev))
return FALSE;
buf = XDR_INLINE (xdrs, 4 * BYTES_PER_XDR_UNIT);
@@ -138,8 +136,6 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->ia_gen))
- return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ia_dev))
return FALSE;
buf = XDR_INLINE (xdrs, 4 * BYTES_PER_XDR_UNIT);
@@ -196,8 +192,6 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->ia_gen))
- return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ia_dev))
return FALSE;
if (!xdr_u_int (xdrs, &objp->mode))
@@ -241,8 +235,6 @@ xdr_gfs3_stat_req (XDR *xdrs, gfs3_stat_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
return FALSE;
return TRUE;
@@ -273,8 +265,6 @@ xdr_gfs3_readlink_req (XDR *xdrs, gfs3_readlink_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->size))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -309,8 +299,6 @@ xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->par))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->dev))
return FALSE;
if (!xdr_u_int (xdrs, &objp->mode))
@@ -354,8 +342,6 @@ xdr_gfs3_mkdir_req (XDR *xdrs, gfs3_mkdir_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->par))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->mode))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -397,8 +383,6 @@ xdr_gfs3_unlink_req (XDR *xdrs, gfs3_unlink_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->par))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
return FALSE;
if (!xdr_string (xdrs, &objp->bname, ~0))
@@ -433,8 +417,6 @@ xdr_gfs3_rmdir_req (XDR *xdrs, gfs3_rmdir_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->par))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
return FALSE;
if (!xdr_string (xdrs, &objp->bname, ~0))
@@ -469,8 +451,6 @@ xdr_gfs3_symlink_req (XDR *xdrs, gfs3_symlink_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->par))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
return FALSE;
if (!xdr_string (xdrs, &objp->bname, ~0))
@@ -514,12 +494,8 @@ xdr_gfs3_rename_req (XDR *xdrs, gfs3_rename_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->oldpar))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->oldgen))
- return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->newpar))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->newgen))
- return FALSE;
if (!xdr_string (xdrs, &objp->oldpath, ~0))
return FALSE;
if (!xdr_string (xdrs, &objp->oldbname, ~0))
@@ -566,12 +542,8 @@ xdr_gfs3_link_req (XDR *xdrs, gfs3_link_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->oldino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->oldgen))
- return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->newpar))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->newgen))
- return FALSE;
if (!xdr_string (xdrs, &objp->oldpath, ~0))
return FALSE;
if (!xdr_string (xdrs, &objp->newpath, ~0))
@@ -610,8 +582,6 @@ xdr_gfs3_truncate_req (XDR *xdrs, gfs3_truncate_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->offset))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -646,8 +616,6 @@ xdr_gfs3_open_req (XDR *xdrs, gfs3_open_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
if (!xdr_u_int (xdrs, &objp->wbflags))
@@ -682,8 +650,6 @@ xdr_gfs3_read_req (XDR *xdrs, gfs3_read_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -725,8 +691,6 @@ xdr_gfs3_lookup_req (XDR *xdrs, gfs3_lookup_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->par))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -769,8 +733,6 @@ xdr_gfs3_write_req (XDR *xdrs, gfs3_write_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -807,8 +769,6 @@ xdr_gfs3_statfs_req (XDR *xdrs, gfs3_statfs_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
return FALSE;
return TRUE;
@@ -839,8 +799,6 @@ xdr_gfs3_lk_req (XDR *xdrs, gfs3_lk_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_int (xdrs, &objp->cmd))
@@ -877,8 +835,6 @@ xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->cmd))
return FALSE;
if (!xdr_u_int (xdrs, &objp->type))
@@ -902,8 +858,6 @@ xdr_gfs3_finodelk_req (XDR *xdrs, gfs3_finodelk_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_int (xdrs, &objp->cmd))
@@ -927,8 +881,6 @@ xdr_gfs3_flush_req (XDR *xdrs, gfs3_flush_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
return TRUE;
@@ -944,8 +896,6 @@ xdr_gfs3_fsync_req (XDR *xdrs, gfs3_fsync_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_int (xdrs, &objp->data))
@@ -980,8 +930,6 @@ xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
@@ -1001,8 +949,6 @@ xdr_gfs3_fsetxattr_req (XDR *xdrs, gfs3_fsetxattr_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
@@ -1022,8 +968,6 @@ xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
@@ -1058,8 +1002,6 @@ xdr_gfs3_fxattrop_req (XDR *xdrs, gfs3_fxattrop_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
@@ -1094,8 +1036,6 @@ xdr_gfs3_getxattr_req (XDR *xdrs, gfs3_getxattr_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->namelen))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -1130,8 +1070,6 @@ xdr_gfs3_fgetxattr_req (XDR *xdrs, gfs3_fgetxattr_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_int (xdrs, &objp->namelen))
@@ -1166,8 +1104,6 @@ xdr_gfs3_removexattr_req (XDR *xdrs, gfs3_removexattr_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
return FALSE;
if (!xdr_string (xdrs, &objp->name, ~0))
@@ -1185,8 +1121,6 @@ xdr_gfs3_opendir_req (XDR *xdrs, gfs3_opendir_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
return FALSE;
return TRUE;
@@ -1217,8 +1151,6 @@ xdr_gfs3_fsyncdir_req (XDR *xdrs, gfs3_fsyncdir_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_int (xdrs, &objp->data))
@@ -1236,8 +1168,6 @@ xdr_gfs3_readdir_req (XDR *xdrs, gfs3_readdir_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -1257,8 +1187,6 @@ xdr_gfs3_readdirp_req (XDR *xdrs, gfs3_readdirp_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -1304,8 +1232,6 @@ xdr_gfs3_access_req (XDR *xdrs, gfs3_access_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->mask))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -1323,8 +1249,6 @@ xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->par))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
if (!xdr_u_int (xdrs, &objp->mode))
@@ -1370,8 +1294,6 @@ xdr_gfs3_ftruncate_req (XDR *xdrs, gfs3_ftruncate_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -1406,8 +1328,6 @@ xdr_gfs3_fstat_req (XDR *xdrs, gfs3_fstat_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
return TRUE;
@@ -1438,8 +1358,6 @@ xdr_gfs3_entrylk_req (XDR *xdrs, gfs3_entrylk_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->cmd))
return FALSE;
if (!xdr_u_int (xdrs, &objp->type))
@@ -1465,8 +1383,6 @@ xdr_gfs3_fentrylk_req (XDR *xdrs, gfs3_fentrylk_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_int (xdrs, &objp->cmd))
@@ -1493,8 +1409,6 @@ xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_gf_iatt (xdrs, &objp->stbuf))
return FALSE;
if (!xdr_int (xdrs, &objp->valid))
@@ -1751,8 +1665,6 @@ xdr_gfs3_releasedir_req (XDR *xdrs, gfs3_releasedir_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
return TRUE;
@@ -1768,8 +1680,6 @@ xdr_gfs3_release_req (XDR *xdrs, gfs3_release_req *objp)
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->ino))
return FALSE;
- if (!xdr_u_quad_t (xdrs, &objp->gen))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
return TRUE;
diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h
index b2f979062..6fcda3d26 100644
--- a/rpc/xdr/src/glusterfs3-xdr.h
+++ b/rpc/xdr/src/glusterfs3-xdr.h
@@ -245,7 +245,6 @@ gf_flock_from_flock (struct gf_flock *gf_flock, struct flock *flock)
struct gf_iatt {
char ia_gfid[16];
u_quad_t ia_ino;
- u_quad_t ia_gen;
u_quad_t ia_dev;
u_int mode;
u_int ia_nlink;
@@ -273,7 +272,6 @@ gf_stat_to_iatt (struct gf_iatt *gf_stat, struct iatt *iatt)
memcpy (iatt->ia_gfid, gf_stat->ia_gfid, 16);
iatt->ia_ino = gf_stat->ia_ino ;
- iatt->ia_gen = gf_stat->ia_gen ;
iatt->ia_dev = gf_stat->ia_dev ;
iatt->ia_type = ia_type_from_st_mode (gf_stat->mode) ;
iatt->ia_prot = ia_prot_from_st_mode (gf_stat->mode) ;
@@ -301,7 +299,6 @@ gf_stat_from_iatt (struct gf_iatt *gf_stat, struct iatt *iatt)
memcpy (gf_stat->ia_gfid, iatt->ia_gfid, 16);
gf_stat->ia_ino = iatt->ia_ino ;
- gf_stat->ia_gen = iatt->ia_gen ;
gf_stat->ia_dev = iatt->ia_dev ;
gf_stat->mode = st_mode_from_ia (iatt->ia_prot, iatt->ia_type);
gf_stat->ia_nlink = iatt->ia_nlink ;
@@ -325,7 +322,6 @@ struct gfs3_stat_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
char *path;
};
typedef struct gfs3_stat_req gfs3_stat_req;
@@ -342,7 +338,6 @@ struct gfs3_readlink_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
u_int size;
char *path;
};
@@ -361,7 +356,6 @@ struct gfs3_mknod_req {
u_quad_t gfs_id;
char pargfid[16];
u_quad_t par;
- u_quad_t gen;
u_quad_t dev;
u_int mode;
char *path;
@@ -387,7 +381,6 @@ struct gfs3_mkdir_req {
u_quad_t gfs_id;
char pargfid[16];
u_quad_t par;
- u_quad_t gen;
u_int mode;
char *path;
char *bname;
@@ -412,7 +405,6 @@ struct gfs3_unlink_req {
u_quad_t gfs_id;
char pargfid[16];
u_quad_t par;
- u_quad_t gen;
char *path;
char *bname;
};
@@ -431,7 +423,6 @@ struct gfs3_rmdir_req {
u_quad_t gfs_id;
char pargfid[16];
u_quad_t par;
- u_quad_t gen;
char *path;
char *bname;
};
@@ -450,7 +441,6 @@ struct gfs3_symlink_req {
u_quad_t gfs_id;
char pargfid[16];
u_quad_t par;
- u_quad_t gen;
char *path;
char *bname;
char *linkname;
@@ -476,9 +466,7 @@ struct gfs3_rename_req {
char oldgfid[16];
char newgfid[16];
u_quad_t oldpar;
- u_quad_t oldgen;
u_quad_t newpar;
- u_quad_t newgen;
char *oldpath;
char *oldbname;
char *newpath;
@@ -503,9 +491,7 @@ struct gfs3_link_req {
char oldgfid[16];
char newgfid[16];
u_quad_t oldino;
- u_quad_t oldgen;
u_quad_t newpar;
- u_quad_t newgen;
char *oldpath;
char *newpath;
char *newbname;
@@ -526,7 +512,6 @@ struct gfs3_truncate_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
u_quad_t offset;
char *path;
};
@@ -545,7 +530,6 @@ struct gfs3_open_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
u_int flags;
u_int wbflags;
char *path;
@@ -564,7 +548,6 @@ struct gfs3_read_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_quad_t offset;
u_int size;
@@ -586,7 +569,6 @@ struct gfs3_lookup_req {
char pargfid[16];
u_quad_t ino;
u_quad_t par;
- u_quad_t gen;
u_int flags;
char *path;
char *bname;
@@ -614,7 +596,6 @@ struct gfs3_write_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_quad_t offset;
u_int size;
@@ -634,7 +615,6 @@ struct gfs3_statfs_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
char *path;
};
typedef struct gfs3_statfs_req gfs3_statfs_req;
@@ -651,7 +631,6 @@ struct gfs3_lk_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_int cmd;
u_int type;
@@ -671,7 +650,6 @@ struct gfs3_inodelk_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
u_int cmd;
u_int type;
struct gf_flock flock;
@@ -684,7 +662,6 @@ struct gfs3_finodelk_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_int cmd;
u_int type;
@@ -697,7 +674,6 @@ struct gfs3_flush_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
};
typedef struct gfs3_flush_req gfs3_flush_req;
@@ -706,7 +682,6 @@ struct gfs3_fsync_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_int data;
};
@@ -725,7 +700,6 @@ struct gfs3_setxattr_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
u_int flags;
struct {
u_int dict_len;
@@ -739,7 +713,6 @@ struct gfs3_fsetxattr_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_int flags;
struct {
@@ -753,7 +726,6 @@ struct gfs3_xattrop_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
u_int flags;
struct {
u_int dict_len;
@@ -778,7 +750,6 @@ struct gfs3_fxattrop_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_int flags;
struct {
@@ -803,7 +774,6 @@ struct gfs3_getxattr_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
u_int namelen;
char *path;
char *name;
@@ -825,7 +795,6 @@ struct gfs3_fgetxattr_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_int namelen;
char *name;
@@ -847,7 +816,6 @@ struct gfs3_removexattr_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
char *path;
char *name;
};
@@ -857,7 +825,6 @@ struct gfs3_opendir_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
char *path;
};
typedef struct gfs3_opendir_req gfs3_opendir_req;
@@ -874,7 +841,6 @@ struct gfs3_fsyncdir_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
int data;
};
@@ -884,7 +850,6 @@ struct gfs3_readdir_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_quad_t offset;
u_int size;
@@ -895,7 +860,6 @@ struct gfs3_readdirp_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_quad_t offset;
u_int size;
@@ -926,7 +890,6 @@ struct gfs3_access_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
u_int mask;
char *path;
};
@@ -936,7 +899,6 @@ struct gfs3_create_req {
u_quad_t gfs_id;
char pargfid[16];
u_quad_t par;
- u_quad_t gen;
u_int flags;
u_int mode;
char *path;
@@ -963,7 +925,6 @@ struct gfs3_ftruncate_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_quad_t offset;
};
@@ -982,7 +943,6 @@ struct gfs3_fstat_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
};
typedef struct gfs3_fstat_req gfs3_fstat_req;
@@ -999,7 +959,6 @@ struct gfs3_entrylk_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
u_int cmd;
u_int type;
u_quad_t namelen;
@@ -1013,7 +972,6 @@ struct gfs3_fentrylk_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
u_int cmd;
u_int type;
@@ -1027,7 +985,6 @@ struct gfs3_setattr_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
struct gf_iatt stbuf;
int valid;
char *path;
@@ -1124,7 +1081,6 @@ struct gfs3_releasedir_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
};
typedef struct gfs3_releasedir_req gfs3_releasedir_req;
@@ -1133,7 +1089,6 @@ struct gfs3_release_req {
u_quad_t gfs_id;
char gfid[16];
u_quad_t ino;
- u_quad_t gen;
quad_t fd;
};
typedef struct gfs3_release_req gfs3_release_req;
diff --git a/rpc/xdr/src/glusterfs3.x b/rpc/xdr/src/glusterfs3.x
index 646f31071..47e2eb76a 100644
--- a/rpc/xdr/src/glusterfs3.x
+++ b/rpc/xdr/src/glusterfs3.x
@@ -25,7 +25,6 @@ struct gf_flock {
struct gf_iatt {
opaque ia_gfid[16];
unsigned hyper ia_ino; /* inode number */
- unsigned hyper ia_gen; /* generation number */
unsigned hyper ia_dev; /* backing device ID */
unsigned int mode; /* mode (type + protection )*/
unsigned int ia_nlink; /* Link count */
@@ -47,7 +46,6 @@ struct gfs3_stat_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
string path<>; /* NULL terminated */
};
@@ -63,7 +61,6 @@ struct gfs3_readlink_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
unsigned int size;
string path<>; /* NULL terminated */
} ;
@@ -80,7 +77,6 @@ struct gfs3_readlink_req {
unsigned hyper gfs_id;
opaque pargfid[16];
unsigned hyper par;
- unsigned hyper gen;
unsigned hyper dev;
unsigned int mode;
string path<>; /* NULL terminated */
@@ -101,7 +97,6 @@ struct gfs3_readlink_req {
unsigned hyper gfs_id;
opaque pargfid[16];
unsigned hyper par;
- unsigned hyper gen;
unsigned int mode;
string path<>; /* NULL terminated */
string bname<>; /* NULL terminated */
@@ -121,7 +116,6 @@ struct gfs3_readlink_req {
unsigned hyper gfs_id;
opaque pargfid[16];
unsigned hyper par;
- unsigned hyper gen;
string path<>; /* NULL terminated */
string bname<>; /* NULL terminated */
};
@@ -138,7 +132,6 @@ struct gfs3_readlink_req {
unsigned hyper gfs_id;
opaque pargfid[16];
unsigned hyper par;
- unsigned hyper gen;
string path<>;
string bname<>; /* NULL terminated */
};
@@ -155,7 +148,6 @@ struct gfs3_readlink_req {
unsigned hyper gfs_id;
opaque pargfid[16];
unsigned hyper par;
- unsigned hyper gen;
string path<>;
string bname<>;
string linkname<>;
@@ -176,9 +168,7 @@ struct gfs3_readlink_req {
opaque oldgfid[16];
opaque newgfid[16];
unsigned hyper oldpar;
- unsigned hyper oldgen;
unsigned hyper newpar;
- unsigned hyper newgen;
string oldpath<>;
string oldbname<>; /* NULL terminated */
string newpath<>;
@@ -201,9 +191,7 @@ struct gfs3_readlink_req {
opaque oldgfid[16];
opaque newgfid[16];
unsigned hyper oldino;
- unsigned hyper oldgen;
unsigned hyper newpar;
- unsigned hyper newgen;
string oldpath<>;
string newpath<>;
string newbname<>;
@@ -221,7 +209,6 @@ struct gfs3_readlink_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
unsigned hyper offset;
string path<>;
};
@@ -238,7 +225,6 @@ struct gfs3_readlink_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
unsigned int flags;
unsigned int wbflags;
string path<>;
@@ -255,7 +241,6 @@ struct gfs3_readlink_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned hyper offset;
unsigned int size;
@@ -274,7 +259,6 @@ struct gfs3_lookup_req {
opaque pargfid[16];
unsigned hyper ino; /* NOTE: used only in case of 'root' lookup */
unsigned hyper par;
- unsigned hyper gen;
unsigned int flags;
string path<>;
string bname<>;
@@ -295,7 +279,6 @@ struct gfs3_lookup_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned hyper offset;
unsigned int size;
@@ -313,7 +296,6 @@ struct gfs3_lookup_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
string path<>;
} ;
struct gfs3_statfs_rsp {
@@ -327,7 +309,6 @@ struct gfs3_lookup_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned int cmd;
unsigned int type;
@@ -344,7 +325,6 @@ struct gfs3_lookup_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
unsigned int cmd;
unsigned int type;
struct gf_flock flock;
@@ -356,7 +336,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned int cmd;
unsigned int type;
@@ -369,7 +348,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
} ;
@@ -378,7 +356,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned int data;
} ;
@@ -395,7 +372,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
unsigned int flags;
opaque dict<>;
string path<>;
@@ -407,7 +383,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned int flags;
opaque dict<>;
@@ -419,7 +394,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
unsigned int flags;
opaque dict<>;
string path<>;
@@ -437,7 +411,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned int flags;
opaque dict<>;
@@ -455,7 +428,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
unsigned int namelen;
string path<>;
string name<>;
@@ -472,7 +444,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned int namelen;
string name<>;
@@ -489,7 +460,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
string path<>;
string name<>;
} ;
@@ -500,7 +470,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
string path<>;
} ;
struct gfs3_opendir_rsp {
@@ -515,7 +484,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
int data;
} ;
@@ -524,7 +492,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned hyper offset;
unsigned int size;
@@ -534,7 +501,6 @@ struct gfs3_finodelk_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned hyper offset;
unsigned int size;
@@ -556,7 +522,6 @@ struct gfs3_access_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
unsigned int mask;
string path<>;
} ;
@@ -566,7 +531,6 @@ struct gfs3_create_req {
unsigned hyper gfs_id;
opaque pargfid[16];
unsigned hyper par;
- unsigned hyper gen;
unsigned int flags;
unsigned int mode;
string path<>;
@@ -589,7 +553,6 @@ struct gfs3_ftruncate_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned hyper offset;
} ;
@@ -606,7 +569,6 @@ struct gfs3_fstat_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
} ;
struct gfs3_fstat_rsp {
@@ -622,7 +584,6 @@ struct gfs3_fstat_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
unsigned int cmd;
unsigned int type;
unsigned hyper namelen;
@@ -635,7 +596,6 @@ struct gfs3_fstat_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
unsigned int cmd;
unsigned int type;
@@ -649,7 +609,6 @@ struct gfs3_fstat_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
struct gf_iatt stbuf;
int valid;
string path<>;
@@ -726,7 +685,6 @@ struct gfs3_releasedir_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
} ;
@@ -734,7 +692,6 @@ struct gfs3_release_req {
unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper ino;
- unsigned hyper gen;
hyper fd;
} ;
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index cb01f0b9c..9135e84ed 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 5d5bf40e0..912dde327 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 24430e6bc..6f818ea02 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 58edca9f6..0d028a2e5 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 804685b65..147cd0fe7 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 32a3869e6..f5af77681 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 9ccfb07ca..0fa254b7e 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 6c63ef6fa..5be504757 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);
generated by cgit (git 2.34.1) at 2024-11-01 13:39:30 +0000