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 --- rpc/xdr/src/glusterfs3-xdr.c | 90 -------------------------------------------- rpc/xdr/src/glusterfs3-xdr.h | 45 ---------------------- rpc/xdr/src/glusterfs3.x | 43 --------------------- 3 files changed, 178 deletions(-) (limited to 'rpc') diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c index 475a1abe..d95958dc 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 b2f97906..6fcda3d2 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 646f3107..47e2eb76 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; } ; -- cgit