summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-transport/socket/src/socket.c2
-rw-r--r--rpc/xdr/src/glusterfs3-xdr.c168
-rw-r--r--rpc/xdr/src/glusterfs3-xdr.h80
-rw-r--r--rpc/xdr/src/glusterfs3.x82
4 files changed, 1 insertions, 331 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 0f0825be8..ae4bd56a8 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -781,7 +781,7 @@ __socket_read_vectored_request (rpc_transport_t *this)
struct iobuf *iobuf = NULL;
uint32_t remaining_size = 0;
uint32_t gluster_write_proc_len = 0;
- gfs3_write_req write_req = {0, };
+ gfs3_write_req write_req = {{0,},};
if (!this || !this->private)
goto out;
diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c
index cbbd0c329..3792d28d2 100644
--- a/rpc/xdr/src/glusterfs3-xdr.c
+++ b/rpc/xdr/src/glusterfs3-xdr.c
@@ -229,8 +229,6 @@ bool_t
xdr_gfs3_stat_req (XDR *xdrs, gfs3_stat_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -242,8 +240,6 @@ bool_t
xdr_gfs3_stat_rsp (XDR *xdrs, gfs3_stat_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -257,8 +253,6 @@ bool_t
xdr_gfs3_readlink_req (XDR *xdrs, gfs3_readlink_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->size))
@@ -272,8 +266,6 @@ bool_t
xdr_gfs3_readlink_rsp (XDR *xdrs, gfs3_readlink_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -289,8 +281,6 @@ bool_t
xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->pargfid, 16))
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->dev))
@@ -311,8 +301,6 @@ bool_t
xdr_gfs3_mknod_rsp (XDR *xdrs, gfs3_mknod_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -330,8 +318,6 @@ bool_t
xdr_gfs3_mkdir_req (XDR *xdrs, gfs3_mkdir_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->pargfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->mode))
@@ -350,8 +336,6 @@ bool_t
xdr_gfs3_mkdir_rsp (XDR *xdrs, gfs3_mkdir_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -369,8 +353,6 @@ bool_t
xdr_gfs3_unlink_req (XDR *xdrs, gfs3_unlink_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->pargfid, 16))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -384,8 +366,6 @@ bool_t
xdr_gfs3_unlink_rsp (XDR *xdrs, gfs3_unlink_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -401,8 +381,6 @@ bool_t
xdr_gfs3_rmdir_req (XDR *xdrs, gfs3_rmdir_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->pargfid, 16))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -416,8 +394,6 @@ bool_t
xdr_gfs3_rmdir_rsp (XDR *xdrs, gfs3_rmdir_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -433,8 +409,6 @@ bool_t
xdr_gfs3_symlink_req (XDR *xdrs, gfs3_symlink_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->pargfid, 16))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -453,8 +427,6 @@ bool_t
xdr_gfs3_symlink_rsp (XDR *xdrs, gfs3_symlink_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -472,8 +444,6 @@ bool_t
xdr_gfs3_rename_req (XDR *xdrs, gfs3_rename_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->oldgfid, 16))
return FALSE;
if (!xdr_opaque (xdrs, objp->newgfid, 16))
@@ -493,8 +463,6 @@ bool_t
xdr_gfs3_rename_rsp (XDR *xdrs, gfs3_rename_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -516,8 +484,6 @@ bool_t
xdr_gfs3_link_req (XDR *xdrs, gfs3_link_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->oldgfid, 16))
return FALSE;
if (!xdr_opaque (xdrs, objp->newgfid, 16))
@@ -535,8 +501,6 @@ bool_t
xdr_gfs3_link_rsp (XDR *xdrs, gfs3_link_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -554,8 +518,6 @@ bool_t
xdr_gfs3_truncate_req (XDR *xdrs, gfs3_truncate_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -569,8 +531,6 @@ bool_t
xdr_gfs3_truncate_rsp (XDR *xdrs, gfs3_truncate_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -586,8 +546,6 @@ bool_t
xdr_gfs3_open_req (XDR *xdrs, gfs3_open_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
@@ -603,8 +561,6 @@ bool_t
xdr_gfs3_open_rsp (XDR *xdrs, gfs3_open_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -618,8 +574,6 @@ bool_t
xdr_gfs3_read_req (XDR *xdrs, gfs3_read_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -635,8 +589,6 @@ bool_t
xdr_gfs3_read_rsp (XDR *xdrs, gfs3_read_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -653,8 +605,6 @@ bool_t
xdr_gfs3_lookup_req (XDR *xdrs, gfs3_lookup_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_opaque (xdrs, objp->pargfid, 16))
@@ -675,8 +625,6 @@ bool_t
xdr_gfs3_lookup_rsp (XDR *xdrs, gfs3_lookup_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -695,8 +643,6 @@ bool_t
xdr_gfs3_write_req (XDR *xdrs, gfs3_write_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -712,8 +658,6 @@ bool_t
xdr_gfs3_write_rsp (XDR *xdrs, gfs3_write_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -729,8 +673,6 @@ bool_t
xdr_gfs3_statfs_req (XDR *xdrs, gfs3_statfs_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -742,8 +684,6 @@ bool_t
xdr_gfs3_statfs_rsp (XDR *xdrs, gfs3_statfs_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -757,8 +697,6 @@ bool_t
xdr_gfs3_lk_req (XDR *xdrs, gfs3_lk_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -776,8 +714,6 @@ bool_t
xdr_gfs3_lk_rsp (XDR *xdrs, gfs3_lk_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -791,8 +727,6 @@ bool_t
xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->cmd))
@@ -812,8 +746,6 @@ bool_t
xdr_gfs3_finodelk_req (XDR *xdrs, gfs3_finodelk_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -833,8 +765,6 @@ bool_t
xdr_gfs3_flush_req (XDR *xdrs, gfs3_flush_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -846,8 +776,6 @@ bool_t
xdr_gfs3_fsync_req (XDR *xdrs, gfs3_fsync_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -861,8 +789,6 @@ bool_t
xdr_gfs3_fsync_rsp (XDR *xdrs, gfs3_fsync_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -878,8 +804,6 @@ bool_t
xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
@@ -895,8 +819,6 @@ bool_t
xdr_gfs3_fsetxattr_req (XDR *xdrs, gfs3_fsetxattr_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -912,8 +834,6 @@ bool_t
xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
@@ -929,8 +849,6 @@ bool_t
xdr_gfs3_xattrop_rsp (XDR *xdrs, gfs3_xattrop_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -944,8 +862,6 @@ bool_t
xdr_gfs3_fxattrop_req (XDR *xdrs, gfs3_fxattrop_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -961,8 +877,6 @@ bool_t
xdr_gfs3_fxattrop_rsp (XDR *xdrs, gfs3_fxattrop_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -976,8 +890,6 @@ bool_t
xdr_gfs3_getxattr_req (XDR *xdrs, gfs3_getxattr_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->namelen))
@@ -993,8 +905,6 @@ bool_t
xdr_gfs3_getxattr_rsp (XDR *xdrs, gfs3_getxattr_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1008,8 +918,6 @@ bool_t
xdr_gfs3_fgetxattr_req (XDR *xdrs, gfs3_fgetxattr_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -1025,8 +933,6 @@ bool_t
xdr_gfs3_fgetxattr_rsp (XDR *xdrs, gfs3_fgetxattr_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1040,8 +946,6 @@ bool_t
xdr_gfs3_removexattr_req (XDR *xdrs, gfs3_removexattr_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -1055,8 +959,6 @@ bool_t
xdr_gfs3_opendir_req (XDR *xdrs, gfs3_opendir_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_string (xdrs, &objp->path, ~0))
@@ -1068,8 +970,6 @@ bool_t
xdr_gfs3_opendir_rsp (XDR *xdrs, gfs3_opendir_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1083,8 +983,6 @@ bool_t
xdr_gfs3_fsyncdir_req (XDR *xdrs, gfs3_fsyncdir_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -1098,8 +996,6 @@ bool_t
xdr_gfs3_readdir_req (XDR *xdrs, gfs3_readdir_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -1115,8 +1011,6 @@ bool_t
xdr_gfs3_readdirp_req (XDR *xdrs, gfs3_readdirp_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -1132,8 +1026,6 @@ bool_t
xdr_gf_setvolume_req (XDR *xdrs, gf_setvolume_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
return FALSE;
return TRUE;
@@ -1143,8 +1035,6 @@ bool_t
xdr_gf_setvolume_rsp (XDR *xdrs, gf_setvolume_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1158,8 +1048,6 @@ bool_t
xdr_gfs3_access_req (XDR *xdrs, gfs3_access_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->mask))
@@ -1173,8 +1061,6 @@ bool_t
xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->pargfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
@@ -1195,8 +1081,6 @@ bool_t
xdr_gfs3_create_rsp (XDR *xdrs, gfs3_create_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1216,8 +1100,6 @@ bool_t
xdr_gfs3_ftruncate_req (XDR *xdrs, gfs3_ftruncate_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -1231,8 +1113,6 @@ bool_t
xdr_gfs3_ftruncate_rsp (XDR *xdrs, gfs3_ftruncate_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1248,8 +1128,6 @@ bool_t
xdr_gfs3_fstat_req (XDR *xdrs, gfs3_fstat_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -1261,8 +1139,6 @@ bool_t
xdr_gfs3_fstat_rsp (XDR *xdrs, gfs3_fstat_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1276,8 +1152,6 @@ bool_t
xdr_gfs3_entrylk_req (XDR *xdrs, gfs3_entrylk_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_u_int (xdrs, &objp->cmd))
@@ -1299,8 +1173,6 @@ bool_t
xdr_gfs3_fentrylk_req (XDR *xdrs, gfs3_fentrylk_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -1323,8 +1195,6 @@ bool_t
xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_gf_iatt (xdrs, &objp->stbuf))
@@ -1340,8 +1210,6 @@ bool_t
xdr_gfs3_setattr_rsp (XDR *xdrs, gfs3_setattr_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1357,8 +1225,6 @@ bool_t
xdr_gfs3_fsetattr_req (XDR *xdrs, gfs3_fsetattr_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_gf_iatt (xdrs, &objp->stbuf))
@@ -1372,8 +1238,6 @@ bool_t
xdr_gfs3_fsetattr_rsp (XDR *xdrs, gfs3_fsetattr_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1389,8 +1253,6 @@ bool_t
xdr_gfs3_rchecksum_req (XDR *xdrs, gfs3_rchecksum_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
return FALSE;
if (!xdr_u_quad_t (xdrs, &objp->offset))
@@ -1407,8 +1269,6 @@ xdr_gfs3_rchecksum_rsp (XDR *xdrs, gfs3_rchecksum_rsp *objp)
if (xdrs->x_op == XDR_ENCODE) {
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
if (buf == NULL) {
if (!xdr_int (xdrs, &objp->op_ret))
@@ -1427,8 +1287,6 @@ xdr_gfs3_rchecksum_rsp (XDR *xdrs, gfs3_rchecksum_rsp *objp)
return FALSE;
return TRUE;
} else if (xdrs->x_op == XDR_DECODE) {
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
if (buf == NULL) {
if (!xdr_int (xdrs, &objp->op_ret))
@@ -1448,8 +1306,6 @@ xdr_gfs3_rchecksum_rsp (XDR *xdrs, gfs3_rchecksum_rsp *objp)
return TRUE;
}
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1465,8 +1321,6 @@ bool_t
xdr_gf_getspec_req (XDR *xdrs, gf_getspec_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
if (!xdr_string (xdrs, &objp->key, ~0))
@@ -1478,8 +1332,6 @@ bool_t
xdr_gf_getspec_rsp (XDR *xdrs, gf_getspec_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1493,8 +1345,6 @@ bool_t
xdr_gf_log_req (XDR *xdrs, gf_log_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_bytes (xdrs, (char **)&objp->msg.msg_val, (u_int *) &objp->msg.msg_len, ~0))
return FALSE;
return TRUE;
@@ -1504,8 +1354,6 @@ bool_t
xdr_gf_notify_req (XDR *xdrs, gf_notify_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_u_int (xdrs, &objp->flags))
return FALSE;
if (!xdr_string (xdrs, &objp->buf, ~0))
@@ -1519,8 +1367,6 @@ xdr_gf_notify_rsp (XDR *xdrs, gf_notify_rsp *objp)
register int32_t *buf;
if (xdrs->x_op == XDR_ENCODE) {
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
if (buf == NULL) {
if (!xdr_int (xdrs, &objp->op_ret))
@@ -1539,8 +1385,6 @@ xdr_gf_notify_rsp (XDR *xdrs, gf_notify_rsp *objp)
return FALSE;
return TRUE;
} else if (xdrs->x_op == XDR_DECODE) {
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
if (buf == NULL) {
if (!xdr_int (xdrs, &objp->op_ret))
@@ -1560,8 +1404,6 @@ xdr_gf_notify_rsp (XDR *xdrs, gf_notify_rsp *objp)
return TRUE;
}
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1577,8 +1419,6 @@ bool_t
xdr_gfs3_releasedir_req (XDR *xdrs, gfs3_releasedir_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -1590,8 +1430,6 @@ bool_t
xdr_gfs3_release_req (XDR *xdrs, gfs3_release_req *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_opaque (xdrs, objp->gfid, 16))
return FALSE;
if (!xdr_quad_t (xdrs, &objp->fd))
@@ -1603,8 +1441,6 @@ bool_t
xdr_gf_common_rsp (XDR *xdrs, gf_common_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1634,8 +1470,6 @@ xdr_gfs3_dirlist (XDR *xdrs, gfs3_dirlist *objp)
bool_t
xdr_gfs3_readdir_rsp (XDR *xdrs, gfs3_readdir_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
@@ -1668,8 +1502,6 @@ xdr_gfs3_dirplist (XDR *xdrs, gfs3_dirplist *objp)
bool_t
xdr_gfs3_readdirp_rsp (XDR *xdrs, gfs3_readdirp_rsp *objp)
{
- if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
- return FALSE;
if (!xdr_int (xdrs, &objp->op_ret))
return FALSE;
if (!xdr_int (xdrs, &objp->op_errno))
diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h
index 140a544e3..b0e20cf79 100644
--- a/rpc/xdr/src/glusterfs3-xdr.h
+++ b/rpc/xdr/src/glusterfs3-xdr.h
@@ -319,14 +319,12 @@ gf_stat_from_iatt (struct gf_iatt *gf_stat, struct iatt *iatt)
/* Gluster FS Payload structures */
struct gfs3_stat_req {
- u_quad_t gfs_id;
char gfid[16];
char *path;
};
typedef struct gfs3_stat_req gfs3_stat_req;
struct gfs3_stat_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -334,7 +332,6 @@ struct gfs3_stat_rsp {
typedef struct gfs3_stat_rsp gfs3_stat_rsp;
struct gfs3_readlink_req {
- u_quad_t gfs_id;
char gfid[16];
u_int size;
char *path;
@@ -342,7 +339,6 @@ struct gfs3_readlink_req {
typedef struct gfs3_readlink_req gfs3_readlink_req;
struct gfs3_readlink_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt buf;
@@ -351,7 +347,6 @@ struct gfs3_readlink_rsp {
typedef struct gfs3_readlink_rsp gfs3_readlink_rsp;
struct gfs3_mknod_req {
- u_quad_t gfs_id;
char pargfid[16];
u_quad_t dev;
u_int mode;
@@ -365,7 +360,6 @@ struct gfs3_mknod_req {
typedef struct gfs3_mknod_req gfs3_mknod_req;
struct gfs3_mknod_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -375,7 +369,6 @@ struct gfs3_mknod_rsp {
typedef struct gfs3_mknod_rsp gfs3_mknod_rsp;
struct gfs3_mkdir_req {
- u_quad_t gfs_id;
char pargfid[16];
u_int mode;
char *path;
@@ -388,7 +381,6 @@ struct gfs3_mkdir_req {
typedef struct gfs3_mkdir_req gfs3_mkdir_req;
struct gfs3_mkdir_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -398,7 +390,6 @@ struct gfs3_mkdir_rsp {
typedef struct gfs3_mkdir_rsp gfs3_mkdir_rsp;
struct gfs3_unlink_req {
- u_quad_t gfs_id;
char pargfid[16];
char *path;
char *bname;
@@ -406,7 +397,6 @@ struct gfs3_unlink_req {
typedef struct gfs3_unlink_req gfs3_unlink_req;
struct gfs3_unlink_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt preparent;
@@ -415,7 +405,6 @@ struct gfs3_unlink_rsp {
typedef struct gfs3_unlink_rsp gfs3_unlink_rsp;
struct gfs3_rmdir_req {
- u_quad_t gfs_id;
char pargfid[16];
char *path;
char *bname;
@@ -423,7 +412,6 @@ struct gfs3_rmdir_req {
typedef struct gfs3_rmdir_req gfs3_rmdir_req;
struct gfs3_rmdir_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt preparent;
@@ -432,7 +420,6 @@ struct gfs3_rmdir_rsp {
typedef struct gfs3_rmdir_rsp gfs3_rmdir_rsp;
struct gfs3_symlink_req {
- u_quad_t gfs_id;
char pargfid[16];
char *path;
char *bname;
@@ -445,7 +432,6 @@ struct gfs3_symlink_req {
typedef struct gfs3_symlink_req gfs3_symlink_req;
struct gfs3_symlink_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -455,7 +441,6 @@ struct gfs3_symlink_rsp {
typedef struct gfs3_symlink_rsp gfs3_symlink_rsp;
struct gfs3_rename_req {
- u_quad_t gfs_id;
char oldgfid[16];
char newgfid[16];
char *oldpath;
@@ -466,7 +451,6 @@ struct gfs3_rename_req {
typedef struct gfs3_rename_req gfs3_rename_req;
struct gfs3_rename_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -478,7 +462,6 @@ struct gfs3_rename_rsp {
typedef struct gfs3_rename_rsp gfs3_rename_rsp;
struct gfs3_link_req {
- u_quad_t gfs_id;
char oldgfid[16];
char newgfid[16];
char *oldpath;
@@ -488,7 +471,6 @@ struct gfs3_link_req {
typedef struct gfs3_link_req gfs3_link_req;
struct gfs3_link_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -498,7 +480,6 @@ struct gfs3_link_rsp {
typedef struct gfs3_link_rsp gfs3_link_rsp;
struct gfs3_truncate_req {
- u_quad_t gfs_id;
char gfid[16];
u_quad_t offset;
char *path;
@@ -506,7 +487,6 @@ struct gfs3_truncate_req {
typedef struct gfs3_truncate_req gfs3_truncate_req;
struct gfs3_truncate_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt prestat;
@@ -515,7 +495,6 @@ struct gfs3_truncate_rsp {
typedef struct gfs3_truncate_rsp gfs3_truncate_rsp;
struct gfs3_open_req {
- u_quad_t gfs_id;
char gfid[16];
u_int flags;
u_int wbflags;
@@ -524,7 +503,6 @@ struct gfs3_open_req {
typedef struct gfs3_open_req gfs3_open_req;
struct gfs3_open_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
quad_t fd;
@@ -532,7 +510,6 @@ struct gfs3_open_rsp {
typedef struct gfs3_open_rsp gfs3_open_rsp;
struct gfs3_read_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_quad_t offset;
@@ -541,7 +518,6 @@ struct gfs3_read_req {
typedef struct gfs3_read_req gfs3_read_req;
struct gfs3_read_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -550,7 +526,6 @@ struct gfs3_read_rsp {
typedef struct gfs3_read_rsp gfs3_read_rsp;
struct gfs3_lookup_req {
- u_quad_t gfs_id;
char gfid[16];
char pargfid[16];
u_int flags;
@@ -564,7 +539,6 @@ struct gfs3_lookup_req {
typedef struct gfs3_lookup_req gfs3_lookup_req;
struct gfs3_lookup_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -577,7 +551,6 @@ struct gfs3_lookup_rsp {
typedef struct gfs3_lookup_rsp gfs3_lookup_rsp;
struct gfs3_write_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_quad_t offset;
@@ -586,7 +559,6 @@ struct gfs3_write_req {
typedef struct gfs3_write_req gfs3_write_req;
struct gfs3_write_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt prestat;
@@ -595,14 +567,12 @@ struct gfs3_write_rsp {
typedef struct gfs3_write_rsp gfs3_write_rsp;
struct gfs3_statfs_req {
- u_quad_t gfs_id;
char gfid[16];
char *path;
};
typedef struct gfs3_statfs_req gfs3_statfs_req;
struct gfs3_statfs_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_statfs statfs;
@@ -610,7 +580,6 @@ struct gfs3_statfs_rsp {
typedef struct gfs3_statfs_rsp gfs3_statfs_rsp;
struct gfs3_lk_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_int cmd;
@@ -620,7 +589,6 @@ struct gfs3_lk_req {
typedef struct gfs3_lk_req gfs3_lk_req;
struct gfs3_lk_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_flock flock;
@@ -628,7 +596,6 @@ struct gfs3_lk_rsp {
typedef struct gfs3_lk_rsp gfs3_lk_rsp;
struct gfs3_inodelk_req {
- u_quad_t gfs_id;
char gfid[16];
u_int cmd;
u_int type;
@@ -639,7 +606,6 @@ struct gfs3_inodelk_req {
typedef struct gfs3_inodelk_req gfs3_inodelk_req;
struct gfs3_finodelk_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_int cmd;
@@ -650,14 +616,12 @@ struct gfs3_finodelk_req {
typedef struct gfs3_finodelk_req gfs3_finodelk_req;
struct gfs3_flush_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
};
typedef struct gfs3_flush_req gfs3_flush_req;
struct gfs3_fsync_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_int data;
@@ -665,7 +629,6 @@ struct gfs3_fsync_req {
typedef struct gfs3_fsync_req gfs3_fsync_req;
struct gfs3_fsync_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt prestat;
@@ -674,7 +637,6 @@ struct gfs3_fsync_rsp {
typedef struct gfs3_fsync_rsp gfs3_fsync_rsp;
struct gfs3_setxattr_req {
- u_quad_t gfs_id;
char gfid[16];
u_int flags;
struct {
@@ -686,7 +648,6 @@ struct gfs3_setxattr_req {
typedef struct gfs3_setxattr_req gfs3_setxattr_req;
struct gfs3_fsetxattr_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_int flags;
@@ -698,7 +659,6 @@ struct gfs3_fsetxattr_req {
typedef struct gfs3_fsetxattr_req gfs3_fsetxattr_req;
struct gfs3_xattrop_req {
- u_quad_t gfs_id;
char gfid[16];
u_int flags;
struct {
@@ -710,7 +670,6 @@ struct gfs3_xattrop_req {
typedef struct gfs3_xattrop_req gfs3_xattrop_req;
struct gfs3_xattrop_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct {
@@ -721,7 +680,6 @@ struct gfs3_xattrop_rsp {
typedef struct gfs3_xattrop_rsp gfs3_xattrop_rsp;
struct gfs3_fxattrop_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_int flags;
@@ -733,7 +691,6 @@ struct gfs3_fxattrop_req {
typedef struct gfs3_fxattrop_req gfs3_fxattrop_req;
struct gfs3_fxattrop_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct {
@@ -744,7 +701,6 @@ struct gfs3_fxattrop_rsp {
typedef struct gfs3_fxattrop_rsp gfs3_fxattrop_rsp;
struct gfs3_getxattr_req {
- u_quad_t gfs_id;
char gfid[16];
u_int namelen;
char *path;
@@ -753,7 +709,6 @@ struct gfs3_getxattr_req {
typedef struct gfs3_getxattr_req gfs3_getxattr_req;
struct gfs3_getxattr_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct {
@@ -764,7 +719,6 @@ struct gfs3_getxattr_rsp {
typedef struct gfs3_getxattr_rsp gfs3_getxattr_rsp;
struct gfs3_fgetxattr_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_int namelen;
@@ -773,7 +727,6 @@ struct gfs3_fgetxattr_req {
typedef struct gfs3_fgetxattr_req gfs3_fgetxattr_req;
struct gfs3_fgetxattr_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct {
@@ -784,7 +737,6 @@ struct gfs3_fgetxattr_rsp {
typedef struct gfs3_fgetxattr_rsp gfs3_fgetxattr_rsp;
struct gfs3_removexattr_req {
- u_quad_t gfs_id;
char gfid[16];
char *path;
char *name;
@@ -792,14 +744,12 @@ struct gfs3_removexattr_req {
typedef struct gfs3_removexattr_req gfs3_removexattr_req;
struct gfs3_opendir_req {
- u_quad_t gfs_id;
char gfid[16];
char *path;
};
typedef struct gfs3_opendir_req gfs3_opendir_req;
struct gfs3_opendir_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
quad_t fd;
@@ -807,7 +757,6 @@ struct gfs3_opendir_rsp {
typedef struct gfs3_opendir_rsp gfs3_opendir_rsp;
struct gfs3_fsyncdir_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
int data;
@@ -815,7 +764,6 @@ struct gfs3_fsyncdir_req {
typedef struct gfs3_fsyncdir_req gfs3_fsyncdir_req;
struct gfs3_readdir_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_quad_t offset;
@@ -824,7 +772,6 @@ struct gfs3_readdir_req {
typedef struct gfs3_readdir_req gfs3_readdir_req;
struct gfs3_readdirp_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_quad_t offset;
@@ -833,7 +780,6 @@ struct gfs3_readdirp_req {
typedef struct gfs3_readdirp_req gfs3_readdirp_req;
struct gf_setvolume_req {
- u_quad_t gfs_id;
struct {
u_int dict_len;
char *dict_val;
@@ -842,7 +788,6 @@ struct gf_setvolume_req {
typedef struct gf_setvolume_req gf_setvolume_req;
struct gf_setvolume_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct {
@@ -853,7 +798,6 @@ struct gf_setvolume_rsp {
typedef struct gf_setvolume_rsp gf_setvolume_rsp;
struct gfs3_access_req {
- u_quad_t gfs_id;
char gfid[16];
u_int mask;
char *path;
@@ -861,7 +805,6 @@ struct gfs3_access_req {
typedef struct gfs3_access_req gfs3_access_req;
struct gfs3_create_req {
- u_quad_t gfs_id;
char pargfid[16];
u_int flags;
u_int mode;
@@ -875,7 +818,6 @@ struct gfs3_create_req {
typedef struct gfs3_create_req gfs3_create_req;
struct gfs3_create_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -886,7 +828,6 @@ struct gfs3_create_rsp {
typedef struct gfs3_create_rsp gfs3_create_rsp;
struct gfs3_ftruncate_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_quad_t offset;
@@ -894,7 +835,6 @@ struct gfs3_ftruncate_req {
typedef struct gfs3_ftruncate_req gfs3_ftruncate_req;
struct gfs3_ftruncate_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt prestat;
@@ -903,14 +843,12 @@ struct gfs3_ftruncate_rsp {
typedef struct gfs3_ftruncate_rsp gfs3_ftruncate_rsp;
struct gfs3_fstat_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
};
typedef struct gfs3_fstat_req gfs3_fstat_req;
struct gfs3_fstat_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -918,7 +856,6 @@ struct gfs3_fstat_rsp {
typedef struct gfs3_fstat_rsp gfs3_fstat_rsp;
struct gfs3_entrylk_req {
- u_quad_t gfs_id;
char gfid[16];
u_int cmd;
u_int type;
@@ -930,7 +867,6 @@ struct gfs3_entrylk_req {
typedef struct gfs3_entrylk_req gfs3_entrylk_req;
struct gfs3_fentrylk_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
u_int cmd;
@@ -942,7 +878,6 @@ struct gfs3_fentrylk_req {
typedef struct gfs3_fentrylk_req gfs3_fentrylk_req;
struct gfs3_setattr_req {
- u_quad_t gfs_id;
char gfid[16];
struct gf_iatt stbuf;
int valid;
@@ -951,7 +886,6 @@ struct gfs3_setattr_req {
typedef struct gfs3_setattr_req gfs3_setattr_req;
struct gfs3_setattr_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt statpre;
@@ -960,7 +894,6 @@ struct gfs3_setattr_rsp {
typedef struct gfs3_setattr_rsp gfs3_setattr_rsp;
struct gfs3_fsetattr_req {
- u_quad_t gfs_id;
quad_t fd;
struct gf_iatt stbuf;
int valid;
@@ -968,7 +901,6 @@ struct gfs3_fsetattr_req {
typedef struct gfs3_fsetattr_req gfs3_fsetattr_req;
struct gfs3_fsetattr_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gf_iatt statpre;
@@ -977,7 +909,6 @@ struct gfs3_fsetattr_rsp {
typedef struct gfs3_fsetattr_rsp gfs3_fsetattr_rsp;
struct gfs3_rchecksum_req {
- u_quad_t gfs_id;
quad_t fd;
u_quad_t offset;
u_int len;
@@ -985,7 +916,6 @@ struct gfs3_rchecksum_req {
typedef struct gfs3_rchecksum_req gfs3_rchecksum_req;
struct gfs3_rchecksum_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
u_int weak_checksum;
@@ -997,14 +927,12 @@ struct gfs3_rchecksum_rsp {
typedef struct gfs3_rchecksum_rsp gfs3_rchecksum_rsp;
struct gf_getspec_req {
- u_quad_t gfs_id;
u_int flags;
char *key;
};
typedef struct gf_getspec_req gf_getspec_req;
struct gf_getspec_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
char *spec;
@@ -1012,7 +940,6 @@ struct gf_getspec_rsp {
typedef struct gf_getspec_rsp gf_getspec_rsp;
struct gf_log_req {
- u_quad_t gfs_id;
struct {
u_int msg_len;
char *msg_val;
@@ -1021,14 +948,12 @@ struct gf_log_req {
typedef struct gf_log_req gf_log_req;
struct gf_notify_req {
- u_quad_t gfs_id;
u_int flags;
char *buf;
};
typedef struct gf_notify_req gf_notify_req;
struct gf_notify_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
u_int flags;
@@ -1037,21 +962,18 @@ struct gf_notify_rsp {
typedef struct gf_notify_rsp gf_notify_rsp;
struct gfs3_releasedir_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
};
typedef struct gfs3_releasedir_req gfs3_releasedir_req;
struct gfs3_release_req {
- u_quad_t gfs_id;
char gfid[16];
quad_t fd;
};
typedef struct gfs3_release_req gfs3_release_req;
struct gf_common_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
};
@@ -1068,7 +990,6 @@ struct gfs3_dirlist {
typedef struct gfs3_dirlist gfs3_dirlist;
struct gfs3_readdir_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gfs3_dirlist *reply;
@@ -1087,7 +1008,6 @@ struct gfs3_dirplist {
typedef struct gfs3_dirplist gfs3_dirplist;
struct gfs3_readdirp_rsp {
- u_quad_t gfs_id;
int op_ret;
int op_errno;
struct gfs3_dirplist *reply;
diff --git a/rpc/xdr/src/glusterfs3.x b/rpc/xdr/src/glusterfs3.x
index 3029ad438..a46047f11 100644
--- a/rpc/xdr/src/glusterfs3.x
+++ b/rpc/xdr/src/glusterfs3.x
@@ -43,13 +43,11 @@ struct gf_iatt {
};
struct gfs3_stat_req {
- unsigned hyper gfs_id;
opaque gfid[16];
string path<>; /* NULL terminated */
};
struct gfs3_stat_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -57,13 +55,11 @@ struct gfs3_stat_rsp {
struct gfs3_readlink_req {
- unsigned hyper gfs_id;
opaque gfid[16];
unsigned int size;
string path<>; /* NULL terminated */
} ;
struct gfs3_readlink_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt buf;
@@ -72,7 +68,6 @@ struct gfs3_readlink_req {
struct gfs3_mknod_req {
- unsigned hyper gfs_id;
opaque pargfid[16];
unsigned hyper dev;
unsigned int mode;
@@ -81,7 +76,6 @@ struct gfs3_readlink_req {
opaque dict<>;
} ;
struct gfs3_mknod_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -91,7 +85,6 @@ struct gfs3_readlink_req {
struct gfs3_mkdir_req {
- unsigned hyper gfs_id;
opaque pargfid[16];
unsigned int mode;
string path<>; /* NULL terminated */
@@ -99,7 +92,6 @@ struct gfs3_readlink_req {
opaque dict<>;
} ;
struct gfs3_mkdir_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -109,13 +101,11 @@ struct gfs3_readlink_req {
struct gfs3_unlink_req {
- unsigned hyper gfs_id;
opaque pargfid[16];
string path<>; /* NULL terminated */
string bname<>; /* NULL terminated */
};
struct gfs3_unlink_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt preparent;
@@ -124,13 +114,11 @@ struct gfs3_readlink_req {
struct gfs3_rmdir_req {
- unsigned hyper gfs_id;
opaque pargfid[16];
string path<>;
string bname<>; /* NULL terminated */
};
struct gfs3_rmdir_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt preparent;
@@ -139,7 +127,6 @@ struct gfs3_readlink_req {
struct gfs3_symlink_req {
- unsigned hyper gfs_id;
opaque pargfid[16];
string path<>;
string bname<>;
@@ -147,7 +134,6 @@ struct gfs3_readlink_req {
opaque dict<>;
};
struct gfs3_symlink_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -157,7 +143,6 @@ struct gfs3_readlink_req {
struct gfs3_rename_req {
- unsigned hyper gfs_id;
opaque oldgfid[16];
opaque newgfid[16];
string oldpath<>;
@@ -166,7 +151,6 @@ struct gfs3_readlink_req {
string newbname<>; /* NULL terminated */
};
struct gfs3_rename_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -178,7 +162,6 @@ struct gfs3_readlink_req {
struct gfs3_link_req {
- unsigned hyper gfs_id;
opaque oldgfid[16];
opaque newgfid[16];
string oldpath<>;
@@ -186,7 +169,6 @@ struct gfs3_readlink_req {
string newbname<>;
};
struct gfs3_link_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -195,13 +177,11 @@ struct gfs3_readlink_req {
};
struct gfs3_truncate_req {
- unsigned hyper gfs_id;
opaque gfid[16];
unsigned hyper offset;
string path<>;
};
struct gfs3_truncate_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt prestat;
@@ -210,14 +190,12 @@ struct gfs3_readlink_req {
struct gfs3_open_req {
- unsigned hyper gfs_id;
opaque gfid[16];
unsigned int flags;
unsigned int wbflags;
string path<>;
};
struct gfs3_open_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
hyper fd;
@@ -225,14 +203,12 @@ struct gfs3_readlink_req {
struct gfs3_read_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned hyper offset;
unsigned int size;
};
struct gfs3_read_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -240,7 +216,6 @@ struct gfs3_readlink_req {
} ;
struct gfs3_lookup_req {
- unsigned hyper gfs_id;
opaque gfid[16];
opaque pargfid[16];
unsigned int flags;
@@ -249,7 +224,6 @@ struct gfs3_lookup_req {
opaque dict<>;
};
struct gfs3_lookup_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -260,14 +234,12 @@ struct gfs3_lookup_req {
struct gfs3_write_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned hyper offset;
unsigned int size;
};
struct gfs3_write_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt prestat;
@@ -276,19 +248,16 @@ struct gfs3_lookup_req {
struct gfs3_statfs_req {
- unsigned hyper gfs_id;
opaque gfid[16];
string path<>;
} ;
struct gfs3_statfs_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_statfs statfs;
} ;
struct gfs3_lk_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned int cmd;
@@ -296,14 +265,12 @@ struct gfs3_lookup_req {
struct gf_flock flock;
} ;
struct gfs3_lk_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_flock flock;
} ;
struct gfs3_inodelk_req {
- unsigned hyper gfs_id;
opaque gfid[16];
unsigned int cmd;
unsigned int type;
@@ -313,7 +280,6 @@ struct gfs3_lookup_req {
} ;
struct gfs3_finodelk_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned int cmd;
@@ -324,20 +290,17 @@ struct gfs3_finodelk_req {
struct gfs3_flush_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
} ;
struct gfs3_fsync_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned int data;
} ;
struct gfs3_fsync_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt prestat;
@@ -346,7 +309,6 @@ struct gfs3_finodelk_req {
struct gfs3_setxattr_req {
- unsigned hyper gfs_id;
opaque gfid[16];
unsigned int flags;
opaque dict<>;
@@ -356,7 +318,6 @@ struct gfs3_finodelk_req {
struct gfs3_fsetxattr_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned int flags;
@@ -366,7 +327,6 @@ struct gfs3_finodelk_req {
struct gfs3_xattrop_req {
- unsigned hyper gfs_id;
opaque gfid[16];
unsigned int flags;
opaque dict<>;
@@ -374,7 +334,6 @@ struct gfs3_finodelk_req {
} ;
struct gfs3_xattrop_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
opaque dict<>;
@@ -382,7 +341,6 @@ struct gfs3_finodelk_req {
struct gfs3_fxattrop_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned int flags;
@@ -390,7 +348,6 @@ struct gfs3_finodelk_req {
} ;
struct gfs3_fxattrop_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
opaque dict<>;
@@ -398,14 +355,12 @@ struct gfs3_finodelk_req {
struct gfs3_getxattr_req {
- unsigned hyper gfs_id;
opaque gfid[16];
unsigned int namelen;
string path<>;
string name<>;
} ;
struct gfs3_getxattr_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
opaque dict<>;
@@ -413,14 +368,12 @@ struct gfs3_finodelk_req {
struct gfs3_fgetxattr_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned int namelen;
string name<>;
} ;
struct gfs3_fgetxattr_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
opaque dict<>;
@@ -428,7 +381,6 @@ struct gfs3_finodelk_req {
struct gfs3_removexattr_req {
- unsigned hyper gfs_id;
opaque gfid[16];
string path<>;
string name<>;
@@ -437,12 +389,10 @@ struct gfs3_finodelk_req {
struct gfs3_opendir_req {
- unsigned hyper gfs_id;
opaque gfid[16];
string path<>;
} ;
struct gfs3_opendir_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
hyper fd;
@@ -450,14 +400,12 @@ struct gfs3_finodelk_req {
struct gfs3_fsyncdir_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
int data;
} ;
struct gfs3_readdir_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned hyper offset;
@@ -465,7 +413,6 @@ struct gfs3_finodelk_req {
};
struct gfs3_readdirp_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned hyper offset;
@@ -474,18 +421,15 @@ struct gfs3_finodelk_req {
struct gf_setvolume_req {
- unsigned hyper gfs_id;
opaque dict<>;
} ;
struct gf_setvolume_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
opaque dict<>;
} ;
struct gfs3_access_req {
- unsigned hyper gfs_id;
opaque gfid[16];
unsigned int mask;
string path<>;
@@ -493,7 +437,6 @@ struct gfs3_access_req {
struct gfs3_create_req {
- unsigned hyper gfs_id;
opaque pargfid[16];
unsigned int flags;
unsigned int mode;
@@ -502,7 +445,6 @@ struct gfs3_create_req {
opaque dict<>;
} ;
struct gfs3_create_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -514,13 +456,11 @@ struct gfs3_create_rsp {
struct gfs3_ftruncate_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned hyper offset;
} ;
struct gfs3_ftruncate_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt prestat;
@@ -529,12 +469,10 @@ struct gfs3_ftruncate_rsp {
struct gfs3_fstat_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
} ;
struct gfs3_fstat_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt stat;
@@ -543,7 +481,6 @@ struct gfs3_fstat_req {
struct gfs3_entrylk_req {
- unsigned hyper gfs_id;
opaque gfid[16];
unsigned int cmd;
unsigned int type;
@@ -554,7 +491,6 @@ struct gfs3_fstat_req {
};
struct gfs3_fentrylk_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
unsigned int cmd;
@@ -566,14 +502,12 @@ struct gfs3_fstat_req {
struct gfs3_setattr_req {
- unsigned hyper gfs_id;
opaque gfid[16];
struct gf_iatt stbuf;
int valid;
string path<>;
} ;
struct gfs3_setattr_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt statpre;
@@ -581,13 +515,11 @@ struct gfs3_fstat_req {
} ;
struct gfs3_fsetattr_req {
- unsigned hyper gfs_id;
hyper fd;
struct gf_iatt stbuf;
int valid;
} ;
struct gfs3_fsetattr_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gf_iatt statpre;
@@ -595,13 +527,11 @@ struct gfs3_fstat_req {
} ;
struct gfs3_rchecksum_req {
- unsigned hyper gfs_id;
hyper fd;
unsigned hyper offset;
unsigned int len;
} ;
struct gfs3_rchecksum_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
unsigned int weak_checksum;
@@ -610,12 +540,10 @@ struct gfs3_fstat_req {
struct gf_getspec_req {
- unsigned hyper gfs_id;
unsigned int flags;
string key<>;
} ;
struct gf_getspec_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
string spec<>;
@@ -623,17 +551,14 @@ struct gfs3_fstat_req {
struct gf_log_req {
- unsigned hyper gfs_id;
opaque msg<>;
};
struct gf_notify_req {
- unsigned hyper gfs_id;
unsigned int flags;
string buf<>;
} ;
struct gf_notify_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
unsigned int flags;
@@ -641,19 +566,16 @@ struct gfs3_fstat_req {
} ;
struct gfs3_releasedir_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
} ;
struct gfs3_release_req {
- unsigned hyper gfs_id;
opaque gfid[16];
hyper fd;
} ;
struct gf_common_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
} ;
@@ -669,7 +591,6 @@ struct gfs3_dirlist {
struct gfs3_readdir_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gfs3_dirlist *reply;
@@ -686,14 +607,12 @@ struct gfs3_dirplist {
};
struct gfs3_readdirp_rsp {
- unsigned hyper gfs_id;
int op_ret;
int op_errno;
struct gfs3_dirplist *reply;
};
struct gf_dump_req {
- unsigned hyper gfs_id;
};
struct gf_prog_detail {
@@ -704,7 +623,6 @@ struct gf_prog_detail {
};
struct gf_dump_rsp {
- unsigned hyper gfs_id;
struct gf_prog_detail *prog;
};
generated by cgit (git 2.34.1) at 2024-11-01 13:28:08 +0000