remove 'ino' from 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

3 files changed, 1 insertions, 173 deletions

diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c
index d95958dc9..cbbd0c329 100644
--- a/rpc/xdr/src/glusterfs3-xdr.c
+++ b/rpc/xdr/src/glusterfs3-xdr.c
@@ -233,8 +233,6 @@ xdr_gfs3_stat_req (XDR *xdrs, gfs3_stat_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
@@ -263,8 +261,6 @@ xdr_gfs3_readlink_req (XDR *xdrs, gfs3_readlink_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->size))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
@@ -297,8 +293,6 @@ xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->par))
-		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->dev))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mode))
@@ -340,8 +334,6 @@ xdr_gfs3_mkdir_req (XDR *xdrs, gfs3_mkdir_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->par))
-		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mode))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
@@ -381,8 +373,6 @@ xdr_gfs3_unlink_req (XDR *xdrs, gfs3_unlink_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->par))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
@@ -415,8 +405,6 @@ xdr_gfs3_rmdir_req (XDR *xdrs, gfs3_rmdir_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->par))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
@@ -449,8 +437,6 @@ xdr_gfs3_symlink_req (XDR *xdrs, gfs3_symlink_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->par))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
@@ -492,10 +478,6 @@ xdr_gfs3_rename_req (XDR *xdrs, gfs3_rename_req *objp)
                  return FALSE;
 	 if (!xdr_opaque (xdrs, objp->newgfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->oldpar))
-		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->newpar))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->oldpath, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->oldbname, ~0))
@@ -540,10 +522,6 @@ xdr_gfs3_link_req (XDR *xdrs, gfs3_link_req *objp)
                  return FALSE;
 	 if (!xdr_opaque (xdrs, objp->newgfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->oldino))
-		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->newpar))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->oldpath, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->newpath, ~0))
@@ -580,8 +558,6 @@ xdr_gfs3_truncate_req (XDR *xdrs, gfs3_truncate_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->offset))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
@@ -614,8 +590,6 @@ xdr_gfs3_open_req (XDR *xdrs, gfs3_open_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->wbflags))
@@ -648,8 +622,6 @@ xdr_gfs3_read_req (XDR *xdrs, gfs3_read_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -687,10 +659,6 @@ xdr_gfs3_lookup_req (XDR *xdrs, gfs3_lookup_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->par))
-		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
@@ -731,8 +699,6 @@ xdr_gfs3_write_req (XDR *xdrs, gfs3_write_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -767,8 +733,6 @@ xdr_gfs3_statfs_req (XDR *xdrs, gfs3_statfs_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
@@ -797,8 +761,6 @@ xdr_gfs3_lk_req (XDR *xdrs, gfs3_lk_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->cmd))
@@ -833,8 +795,6 @@ xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->cmd))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->type))
@@ -856,8 +816,6 @@ xdr_gfs3_finodelk_req (XDR *xdrs, gfs3_finodelk_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->cmd))
@@ -879,8 +837,6 @@ xdr_gfs3_flush_req (XDR *xdrs, gfs3_flush_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	return TRUE;
@@ -894,8 +850,6 @@ xdr_gfs3_fsync_req (XDR *xdrs, gfs3_fsync_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->data))
@@ -928,8 +882,6 @@ xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 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))
@@ -947,8 +899,6 @@ xdr_gfs3_fsetxattr_req (XDR *xdrs, gfs3_fsetxattr_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
@@ -966,8 +916,6 @@ xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 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))
@@ -1000,8 +948,6 @@ xdr_gfs3_fxattrop_req (XDR *xdrs, gfs3_fxattrop_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
@@ -1034,8 +980,6 @@ xdr_gfs3_getxattr_req (XDR *xdrs, gfs3_getxattr_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->namelen))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
@@ -1068,8 +1012,6 @@ xdr_gfs3_fgetxattr_req (XDR *xdrs, gfs3_fgetxattr_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->namelen))
@@ -1102,8 +1044,6 @@ xdr_gfs3_removexattr_req (XDR *xdrs, gfs3_removexattr_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->name, ~0))
@@ -1119,8 +1059,6 @@ xdr_gfs3_opendir_req (XDR *xdrs, gfs3_opendir_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	return TRUE;
@@ -1149,8 +1087,6 @@ xdr_gfs3_fsyncdir_req (XDR *xdrs, gfs3_fsyncdir_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->data))
@@ -1166,8 +1102,6 @@ xdr_gfs3_readdir_req (XDR *xdrs, gfs3_readdir_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -1185,8 +1119,6 @@ xdr_gfs3_readdirp_req (XDR *xdrs, gfs3_readdirp_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -1230,8 +1162,6 @@ xdr_gfs3_access_req (XDR *xdrs, gfs3_access_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mask))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
@@ -1247,8 +1177,6 @@ xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->par))
-		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mode))
@@ -1292,8 +1220,6 @@ xdr_gfs3_ftruncate_req (XDR *xdrs, gfs3_ftruncate_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -1326,8 +1252,6 @@ xdr_gfs3_fstat_req (XDR *xdrs, gfs3_fstat_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	return TRUE;
@@ -1356,8 +1280,6 @@ xdr_gfs3_entrylk_req (XDR *xdrs, gfs3_entrylk_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->cmd))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->type))
@@ -1381,8 +1303,6 @@ xdr_gfs3_fentrylk_req (XDR *xdrs, gfs3_fentrylk_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->cmd))
@@ -1407,8 +1327,6 @@ xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->stbuf))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->valid))
@@ -1663,8 +1581,6 @@ xdr_gfs3_releasedir_req (XDR *xdrs, gfs3_releasedir_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	return TRUE;
@@ -1678,8 +1594,6 @@ xdr_gfs3_release_req (XDR *xdrs, gfs3_release_req *objp)
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-	 if (!xdr_u_quad_t (xdrs, &objp->ino))
-		 return FALSE;
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
 	return TRUE;
@@ -1737,7 +1651,7 @@ xdr_gfs3_dirplist (XDR *xdrs, gfs3_dirplist *objp)
 	 if (!xdr_u_quad_t (xdrs, &objp->d_ino))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->d_off))
-		 return FALSE;
+                 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->d_len))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->d_type))
diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h
index 6fcda3d26..140a544e3 100644
--- a/rpc/xdr/src/glusterfs3-xdr.h
+++ b/rpc/xdr/src/glusterfs3-xdr.h
@@ -321,7 +321,6 @@ gf_stat_from_iatt (struct gf_iatt *gf_stat, struct iatt *iatt)
 struct gfs3_stat_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	char *path;
 };
 typedef struct gfs3_stat_req gfs3_stat_req;
@@ -337,7 +336,6 @@ typedef struct gfs3_stat_rsp gfs3_stat_rsp;
 struct gfs3_readlink_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	u_int size;
 	char *path;
 };
@@ -355,7 +353,6 @@ typedef struct gfs3_readlink_rsp gfs3_readlink_rsp;
 struct gfs3_mknod_req {
 	u_quad_t gfs_id;
 	char pargfid[16];
-	u_quad_t par;
 	u_quad_t dev;
 	u_int mode;
 	char *path;
@@ -380,7 +377,6 @@ typedef struct gfs3_mknod_rsp gfs3_mknod_rsp;
 struct gfs3_mkdir_req {
 	u_quad_t gfs_id;
 	char pargfid[16];
-	u_quad_t par;
 	u_int mode;
 	char *path;
 	char *bname;
@@ -404,7 +400,6 @@ typedef struct gfs3_mkdir_rsp gfs3_mkdir_rsp;
 struct gfs3_unlink_req {
 	u_quad_t gfs_id;
 	char pargfid[16];
-	u_quad_t par;
 	char *path;
 	char *bname;
 };
@@ -422,7 +417,6 @@ typedef struct gfs3_unlink_rsp gfs3_unlink_rsp;
 struct gfs3_rmdir_req {
 	u_quad_t gfs_id;
 	char pargfid[16];
-	u_quad_t par;
 	char *path;
 	char *bname;
 };
@@ -440,7 +434,6 @@ typedef struct gfs3_rmdir_rsp gfs3_rmdir_rsp;
 struct gfs3_symlink_req {
 	u_quad_t gfs_id;
 	char pargfid[16];
-	u_quad_t par;
 	char *path;
 	char *bname;
 	char *linkname;
@@ -465,8 +458,6 @@ struct gfs3_rename_req {
 	u_quad_t gfs_id;
 	char oldgfid[16];
 	char newgfid[16];
-	u_quad_t oldpar;
-	u_quad_t newpar;
 	char *oldpath;
 	char *oldbname;
 	char *newpath;
@@ -490,8 +481,6 @@ struct gfs3_link_req {
 	u_quad_t gfs_id;
 	char oldgfid[16];
 	char newgfid[16];
-	u_quad_t oldino;
-	u_quad_t newpar;
 	char *oldpath;
 	char *newpath;
 	char *newbname;
@@ -511,7 +500,6 @@ typedef struct gfs3_link_rsp gfs3_link_rsp;
 struct gfs3_truncate_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	u_quad_t offset;
 	char *path;
 };
@@ -529,7 +517,6 @@ typedef struct gfs3_truncate_rsp gfs3_truncate_rsp;
 struct gfs3_open_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	u_int flags;
 	u_int wbflags;
 	char *path;
@@ -547,7 +534,6 @@ typedef struct gfs3_open_rsp gfs3_open_rsp;
 struct gfs3_read_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_quad_t offset;
 	u_int size;
@@ -567,8 +553,6 @@ struct gfs3_lookup_req {
 	u_quad_t gfs_id;
 	char gfid[16];
 	char pargfid[16];
-	u_quad_t ino;
-	u_quad_t par;
 	u_int flags;
 	char *path;
 	char *bname;
@@ -595,7 +579,6 @@ typedef struct gfs3_lookup_rsp gfs3_lookup_rsp;
 struct gfs3_write_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_quad_t offset;
 	u_int size;
@@ -614,7 +597,6 @@ typedef struct gfs3_write_rsp gfs3_write_rsp;
 struct gfs3_statfs_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	char *path;
 };
 typedef struct gfs3_statfs_req gfs3_statfs_req;
@@ -630,7 +612,6 @@ typedef struct gfs3_statfs_rsp gfs3_statfs_rsp;
 struct gfs3_lk_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_int cmd;
 	u_int type;
@@ -649,7 +630,6 @@ typedef struct gfs3_lk_rsp gfs3_lk_rsp;
 struct gfs3_inodelk_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	u_int cmd;
 	u_int type;
 	struct gf_flock flock;
@@ -661,7 +641,6 @@ typedef struct gfs3_inodelk_req gfs3_inodelk_req;
 struct gfs3_finodelk_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_int cmd;
 	u_int type;
@@ -673,7 +652,6 @@ typedef struct gfs3_finodelk_req gfs3_finodelk_req;
 struct gfs3_flush_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 };
 typedef struct gfs3_flush_req gfs3_flush_req;
@@ -681,7 +659,6 @@ typedef struct gfs3_flush_req gfs3_flush_req;
 struct gfs3_fsync_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_int data;
 };
@@ -699,7 +676,6 @@ typedef struct gfs3_fsync_rsp gfs3_fsync_rsp;
 struct gfs3_setxattr_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	u_int flags;
 	struct {
 		u_int dict_len;
@@ -712,7 +688,6 @@ typedef struct gfs3_setxattr_req gfs3_setxattr_req;
 struct gfs3_fsetxattr_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_int flags;
 	struct {
@@ -725,7 +700,6 @@ typedef struct gfs3_fsetxattr_req gfs3_fsetxattr_req;
 struct gfs3_xattrop_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	u_int flags;
 	struct {
 		u_int dict_len;
@@ -749,7 +723,6 @@ typedef struct gfs3_xattrop_rsp gfs3_xattrop_rsp;
 struct gfs3_fxattrop_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_int flags;
 	struct {
@@ -773,7 +746,6 @@ typedef struct gfs3_fxattrop_rsp gfs3_fxattrop_rsp;
 struct gfs3_getxattr_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	u_int namelen;
 	char *path;
 	char *name;
@@ -794,7 +766,6 @@ typedef struct gfs3_getxattr_rsp gfs3_getxattr_rsp;
 struct gfs3_fgetxattr_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_int namelen;
 	char *name;
@@ -815,7 +786,6 @@ typedef struct gfs3_fgetxattr_rsp gfs3_fgetxattr_rsp;
 struct gfs3_removexattr_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	char *path;
 	char *name;
 };
@@ -824,7 +794,6 @@ typedef struct gfs3_removexattr_req gfs3_removexattr_req;
 struct gfs3_opendir_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	char *path;
 };
 typedef struct gfs3_opendir_req gfs3_opendir_req;
@@ -840,7 +809,6 @@ typedef struct gfs3_opendir_rsp gfs3_opendir_rsp;
 struct gfs3_fsyncdir_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	int data;
 };
@@ -849,7 +817,6 @@ typedef struct gfs3_fsyncdir_req gfs3_fsyncdir_req;
 struct gfs3_readdir_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_quad_t offset;
 	u_int size;
@@ -859,7 +826,6 @@ typedef struct gfs3_readdir_req gfs3_readdir_req;
 struct gfs3_readdirp_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_quad_t offset;
 	u_int size;
@@ -889,7 +855,6 @@ typedef struct gf_setvolume_rsp gf_setvolume_rsp;
 struct gfs3_access_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	u_int mask;
 	char *path;
 };
@@ -898,7 +863,6 @@ typedef struct gfs3_access_req gfs3_access_req;
 struct gfs3_create_req {
 	u_quad_t gfs_id;
 	char pargfid[16];
-	u_quad_t par;
 	u_int flags;
 	u_int mode;
 	char *path;
@@ -924,7 +888,6 @@ typedef struct gfs3_create_rsp gfs3_create_rsp;
 struct gfs3_ftruncate_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_quad_t offset;
 };
@@ -942,7 +905,6 @@ typedef struct gfs3_ftruncate_rsp gfs3_ftruncate_rsp;
 struct gfs3_fstat_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 };
 typedef struct gfs3_fstat_req gfs3_fstat_req;
@@ -958,7 +920,6 @@ typedef struct gfs3_fstat_rsp gfs3_fstat_rsp;
 struct gfs3_entrylk_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	u_int cmd;
 	u_int type;
 	u_quad_t namelen;
@@ -971,7 +932,6 @@ typedef struct gfs3_entrylk_req gfs3_entrylk_req;
 struct gfs3_fentrylk_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 	u_int cmd;
 	u_int type;
@@ -984,7 +944,6 @@ typedef struct gfs3_fentrylk_req gfs3_fentrylk_req;
 struct gfs3_setattr_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	struct gf_iatt stbuf;
 	int valid;
 	char *path;
@@ -1080,7 +1039,6 @@ typedef struct gf_notify_rsp gf_notify_rsp;
 struct gfs3_releasedir_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	quad_t fd;
 };
 typedef struct gfs3_releasedir_req gfs3_releasedir_req;
@@ -1088,7 +1046,6 @@ typedef struct gfs3_releasedir_req gfs3_releasedir_req;
 struct gfs3_release_req {
 	u_quad_t gfs_id;
 	char gfid[16];
-	u_quad_t ino;
 	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 47e2eb76a..3029ad438 100644
--- a/rpc/xdr/src/glusterfs3.x
+++ b/rpc/xdr/src/glusterfs3.x
@@ -45,7 +45,6 @@ struct gf_iatt {
 struct gfs3_stat_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
         string         path<>;     /* NULL terminated */
 
 };
@@ -60,7 +59,6 @@ struct gfs3_stat_rsp {
 struct gfs3_readlink_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	unsigned int   size;
 	string         path<>;     /* NULL terminated */
 }  ;
@@ -76,7 +74,6 @@ struct gfs3_readlink_req {
  struct gfs3_mknod_req {
         unsigned hyper gfs_id;
         opaque  pargfid[16];
-	unsigned hyper par;
 	unsigned hyper dev;
 	unsigned int mode;
 	string     path<>;     /* NULL terminated */
@@ -96,7 +93,6 @@ struct gfs3_readlink_req {
  struct  gfs3_mkdir_req {
         unsigned hyper gfs_id;
         opaque  pargfid[16];
-	unsigned hyper par;
 	unsigned int mode;
 	string     path<>;     /* NULL terminated */
 	string     bname<>; /* NULL terminated */
@@ -115,7 +111,6 @@ struct gfs3_readlink_req {
  struct   gfs3_unlink_req {
         unsigned hyper gfs_id;
         opaque  pargfid[16];
-	unsigned hyper par;
 	string     path<>;     /* NULL terminated */
 	string     bname<>; /* NULL terminated */
 };
@@ -131,7 +126,6 @@ struct gfs3_readlink_req {
  struct   gfs3_rmdir_req {
         unsigned hyper gfs_id;
         opaque  pargfid[16];
-	unsigned hyper par;
 	string     path<>;
 	string     bname<>; /* NULL terminated */
 };
@@ -147,7 +141,6 @@ struct gfs3_readlink_req {
  struct   gfs3_symlink_req {
         unsigned hyper gfs_id;
         opaque  pargfid[16];
-	unsigned hyper par;
 	string     path<>;
 	string     bname<>;
 	string     linkname<>;
@@ -167,8 +160,6 @@ struct gfs3_readlink_req {
         unsigned hyper gfs_id;
         opaque  oldgfid[16];
         opaque  newgfid[16];
-	unsigned hyper   oldpar;
-	unsigned hyper   newpar;
 	string       oldpath<>;
 	string       oldbname<>; /* NULL terminated */
 	string       newpath<>;
@@ -190,8 +181,6 @@ struct gfs3_readlink_req {
         unsigned hyper gfs_id;
         opaque  oldgfid[16];
         opaque  newgfid[16];
-	unsigned hyper   oldino;
-	unsigned hyper   newpar;
 	string       oldpath<>;
 	string       newpath<>;
 	string       newbname<>;
@@ -208,7 +197,6 @@ struct gfs3_readlink_req {
  struct   gfs3_truncate_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	unsigned hyper offset;
 	string     path<>;
 };
@@ -224,7 +212,6 @@ struct gfs3_readlink_req {
  struct   gfs3_open_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	unsigned int flags;
         unsigned int wbflags;
 	string     path<>;
@@ -240,7 +227,6 @@ struct gfs3_readlink_req {
  struct   gfs3_read_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 	unsigned hyper offset;
 	unsigned int size;
@@ -257,8 +243,6 @@ struct   gfs3_lookup_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
         opaque  pargfid[16];
-	unsigned hyper ino; /* NOTE: used only in case of 'root' lookup */
-	unsigned hyper par;
 	unsigned int flags;
 	string     path<>;
 	string     bname<>;
@@ -278,7 +262,6 @@ struct   gfs3_lookup_req {
  struct   gfs3_write_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 	unsigned hyper offset;
 	unsigned int size;
@@ -295,7 +278,6 @@ struct   gfs3_lookup_req {
  struct gfs3_statfs_req  {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	string     path<>;
 }  ;
  struct gfs3_statfs_rsp {
@@ -308,7 +290,6 @@ struct   gfs3_lookup_req {
  struct gfs3_lk_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper        ino;
 	hyper         fd;
 	unsigned int        cmd;
 	unsigned int        type;
@@ -324,7 +305,6 @@ struct   gfs3_lookup_req {
  struct gfs3_inodelk_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	unsigned int cmd;
 	unsigned int type;
 	struct gf_flock flock;
@@ -335,7 +315,6 @@ struct   gfs3_lookup_req {
 struct   gfs3_finodelk_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 	unsigned int cmd;
 	unsigned int type;
@@ -347,7 +326,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_flush_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 }  ;
 
@@ -355,7 +333,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_fsync_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 	unsigned int data;
 }  ;
@@ -371,7 +348,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_setxattr_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	unsigned int flags;
         opaque     dict<>;
 	string     path<>;
@@ -382,7 +358,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_fsetxattr_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-        unsigned hyper ino;
 	hyper  fd;
 	unsigned int flags;
         opaque     dict<>;
@@ -393,7 +368,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_xattrop_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	unsigned int flags;
         opaque     dict<>;
 	string     path<>;
@@ -410,7 +384,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_fxattrop_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 	unsigned int flags;
 	opaque     dict<>;
@@ -427,7 +400,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_getxattr_req  {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	unsigned int namelen;
 	string     path<>;
 	string     name<>;
@@ -443,7 +415,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_fgetxattr_req  {
         unsigned hyper gfs_id;
         opaque gfid[16];
-        unsigned hyper ino;
 	hyper  fd;
         unsigned int namelen;
 	string     name<>;
@@ -459,7 +430,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_removexattr_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	string     path<>;
 	string     name<>;
 }  ;
@@ -469,7 +439,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_opendir_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	string     path<>;
 }  ;
  struct gfs3_opendir_rsp {
@@ -483,7 +452,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_fsyncdir_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 	int  data;
 }  ;
@@ -491,7 +459,6 @@ struct   gfs3_finodelk_req {
  struct   gfs3_readdir_req  {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 	unsigned hyper offset;
 	unsigned int size;
@@ -500,7 +467,6 @@ struct   gfs3_finodelk_req {
  struct gfs3_readdirp_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 	unsigned hyper offset;
 	unsigned int size;
@@ -521,7 +487,6 @@ struct   gfs3_finodelk_req {
 struct gfs3_access_req  {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	unsigned int mask;
 	string     path<>;
 } ;
@@ -530,7 +495,6 @@ struct gfs3_access_req  {
 struct gfs3_create_req {
         unsigned hyper gfs_id;
         opaque  pargfid[16];
-	unsigned hyper par;
 	unsigned int flags;
 	unsigned int mode;
 	string     path<>;
@@ -552,7 +516,6 @@ struct  gfs3_create_rsp {
 struct   gfs3_ftruncate_req  {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 	unsigned hyper offset;
 } ;
@@ -568,7 +531,6 @@ struct   gfs3_ftruncate_rsp {
 struct gfs3_fstat_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 }  ;
  struct gfs3_fstat_rsp {
@@ -583,7 +545,6 @@ struct gfs3_fstat_req {
  struct   gfs3_entrylk_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper  ino;
 	unsigned int  cmd;
 	unsigned int  type;
 	unsigned hyper  namelen;
@@ -595,7 +556,6 @@ struct gfs3_fstat_req {
  struct   gfs3_fentrylk_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper  ino;
 	hyper   fd;
 	unsigned int  cmd;
 	unsigned int  type;
@@ -608,7 +568,6 @@ struct gfs3_fstat_req {
  struct gfs3_setattr_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-        unsigned hyper       ino;
         struct gf_iatt stbuf;
         int        valid;
         string           path<>;
@@ -684,14 +643,12 @@ struct gfs3_fstat_req {
 struct gfs3_releasedir_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 }  ;
 
 struct gfs3_release_req {
         unsigned hyper gfs_id;
         opaque gfid[16];
-	unsigned hyper ino;
 	hyper  fd;
 }  ;