summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-10-01 04:21:17 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-10-01 03:41:21 -0700
commit3009bc7b585ae9973c6b50ce464a52f20182c63f (patch)
treebd874077f848d933557bfa7b462438bebdae0c3a
parent1af483d3716d6b520c1b4fd984ccecee638b2886 (diff)
remove 'gfs_id' field from all protocol xdr structures
It was kept as a debugging requirement/placeholder. Because RPC is mostly bug free with regard to basic xdr structures, it doesn't make sense to carry this forward in release. Saves 8bytes in each request. Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875
Diffstat
-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
-rw-r--r--xlators/protocol/client/src/client-handshake.c2
-rw-r--r--xlators/protocol/client/src/client3_1-fops.c134
-rw-r--r--xlators/protocol/server/src/server-handshake.c3
-rw-r--r--xlators/protocol/server/src/server3_1-fops.c123
8 files changed, 87 insertions, 507 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 0f0825be8ae..ae4bd56a821 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 cbbd0c329e9..3792d28d255 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 140a544e3ca..b0e20cf79c7 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 3029ad438f9..a46047f115c 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;
};
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 8b0c90ebc8c..101b62eecd7 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -574,7 +574,7 @@ int
client_setvolume (xlator_t *this, struct rpc_clnt *rpc)
{
int ret = 0;
- gf_setvolume_req req = {0,};
+ gf_setvolume_req req = {{0,},};
call_frame_t *fr = NULL;
char *process_uuid_xl = NULL;
clnt_conf_t *conf = NULL;
diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c
index c3add8fd3ba..31cf9301526 100644
--- a/xlators/protocol/client/src/client3_1-fops.c
+++ b/xlators/protocol/client/src/client3_1-fops.c
@@ -2013,18 +2013,16 @@ client_fdctx_destroy (xlator_t *this, clnt_fd_ctx_t *fdctx)
fr = create_frame (this, this->ctx->pool);
if (fdctx->is_dir) {
- gfs3_releasedir_req req = {0,};
+ gfs3_releasedir_req req = {{0,},};
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_RELEASEDIR;
ret = client_submit_request (this, &req, fr, &clnt3_1_fop_prog,
GFS3_OP_RELEASEDIR,
client3_1_releasedir_cbk,
NULL, xdr_from_releasedir_req,
NULL, 0, NULL, 0, NULL);
} else {
- gfs3_release_req req = {0,};
+ gfs3_release_req req = {{0,},};
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_RELEASE;
ret = client_submit_request (this, &req, fr, &clnt3_1_fop_prog,
GFS3_OP_RELEASE,
client3_1_release_cbk, NULL,
@@ -2196,7 +2194,7 @@ int
protocol_client_reopendir (xlator_t *this, clnt_fd_ctx_t *fdctx)
{
int ret = -1;
- gfs3_opendir_req req = {0,};
+ gfs3_opendir_req req = {{0,},};
clnt_local_t *local = NULL;
inode_t *inode = NULL;
char *path = NULL;
@@ -2231,7 +2229,6 @@ protocol_client_reopendir (xlator_t *this, clnt_fd_ctx_t *fdctx)
memcpy (req.gfid, inode->gfid, 16);
req.path = (char *)local->loc.path;
- req.gfs_id = GFS3_OP_OPENDIR;
gf_log (frame->this->name, GF_LOG_DEBUG,
"attempting reopen on %s", local->loc.path);
@@ -2268,7 +2265,7 @@ int
protocol_client_reopen (xlator_t *this, clnt_fd_ctx_t *fdctx)
{
int ret = -1;
- gfs3_open_req req = {0,};
+ gfs3_open_req req = {{0,},};
clnt_local_t *local = NULL;
inode_t *inode = NULL;
char *path = NULL;
@@ -2306,7 +2303,6 @@ protocol_client_reopen (xlator_t *this, clnt_fd_ctx_t *fdctx)
req.flags = gf_flags_from_flags (fdctx->flags);
req.wbflags = fdctx->wbflags;
req.path = (char *)local->loc.path;
- req.gfs_id = GFS3_OP_OPEN;
gf_log (frame->this->name, GF_LOG_DEBUG,
"attempting reopen on %s", local->loc.path);
@@ -2345,7 +2341,7 @@ client3_1_releasedir (call_frame_t *frame, xlator_t *this,
clnt_conf_t *conf = NULL;
clnt_fd_ctx_t *fdctx = NULL;
clnt_args_t *args = NULL;
- gfs3_releasedir_req req = {0,};
+ gfs3_releasedir_req req = {{0,},};
int64_t remote_fd = -1;
int ret = 0;
@@ -2376,7 +2372,6 @@ client3_1_releasedir (call_frame_t *frame, xlator_t *this,
if (remote_fd != -1) {
req.fd = remote_fd;
- req.gfs_id = GFS3_OP_RELEASEDIR;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_RELEASEDIR,
client3_1_releasedir_cbk,
@@ -2401,7 +2396,7 @@ client3_1_release (call_frame_t *frame, xlator_t *this,
clnt_conf_t *conf = NULL;
clnt_fd_ctx_t *fdctx = NULL;
clnt_args_t *args = NULL;
- gfs3_release_req req = {0,};
+ gfs3_release_req req = {{0,},};
int ret = 0;
if (!frame || !this || !data)
@@ -2431,7 +2426,6 @@ client3_1_release (call_frame_t *frame, xlator_t *this,
if (remote_fd != -1) {
req.fd = remote_fd;
- req.gfs_id = GFS3_OP_RELEASE;
delete_granted_locks_fd (fdctx);
@@ -2458,7 +2452,7 @@ client3_1_lookup (call_frame_t *frame, xlator_t *this,
clnt_conf_t *conf = NULL;
clnt_local_t *local = NULL;
clnt_args_t *args = NULL;
- gfs3_lookup_req req = {0,};
+ gfs3_lookup_req req = {{0,},};
int ret = 0;
size_t dict_len = 0;
int op_errno = ESTALE;
@@ -2536,7 +2530,6 @@ client3_1_lookup (call_frame_t *frame, xlator_t *this,
req.path = (char *)args->loc->path;
req.bname = (char *)args->loc->name;
req.dict.dict_len = dict_len;
- req.gfs_id = GFS3_OP_LOOKUP;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_LOOKUP, client3_1_lookup_cbk,
@@ -2590,7 +2583,7 @@ client3_1_stat (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_stat_req req = {0,};
+ gfs3_stat_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -2603,7 +2596,6 @@ client3_1_stat (call_frame_t *frame, xlator_t *this,
memcpy (req.gfid, args->loc->inode->gfid, 16);
req.path = (char *)args->loc->path;
- req.gfs_id = GFS3_OP_STAT;
conf = this->private;
ret = client_submit_request (this, &req, frame, conf->fops,
@@ -2627,7 +2619,7 @@ client3_1_truncate (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_truncate_req req = {0,};
+ gfs3_truncate_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -2642,7 +2634,6 @@ client3_1_truncate (call_frame_t *frame, xlator_t *this,
memcpy (req.gfid, args->loc->inode->gfid, 16);
req.path = (char *)args->loc->path;
req.offset = args->offset;
- req.gfs_id = GFS3_OP_TRUNCATE;
conf = this->private;
@@ -2669,7 +2660,7 @@ client3_1_ftruncate (call_frame_t *frame, xlator_t *this,
clnt_args_t *args = NULL;
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
- gfs3_ftruncate_req req = {0,};
+ gfs3_ftruncate_req req = {{0,},};
int op_errno = EINVAL;
int ret = 0;
@@ -2703,7 +2694,6 @@ client3_1_ftruncate (call_frame_t *frame, xlator_t *this,
req.offset = args->offset;
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_FTRUNCATE;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_FTRUNCATE,
@@ -2728,7 +2718,7 @@ client3_1_access (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_access_req req = {0,};
+ gfs3_access_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -2743,7 +2733,6 @@ client3_1_access (call_frame_t *frame, xlator_t *this,
memcpy (req.gfid, args->loc->inode->gfid, 16);
req.path = (char *)args->loc->path;
req.mask = args->mask;
- req.gfs_id = GFS3_OP_ACCESS;
conf = this->private;
@@ -2769,7 +2758,7 @@ client3_1_readlink (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_readlink_req req = {0,};
+ gfs3_readlink_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -2784,7 +2773,6 @@ client3_1_readlink (call_frame_t *frame, xlator_t *this,
memcpy (req.gfid, args->loc->inode->gfid, 16);
req.path = (char *)args->loc->path;
req.size = args->size;
- req.gfs_id = GFS3_OP_READLINK;
conf = this->private;
ret = client_submit_request (this, &req, frame, conf->fops,
@@ -2812,7 +2800,7 @@ client3_1_unlink (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_unlink_req req = {0,};
+ gfs3_unlink_req req = {{0,},};
int ret = 0;
int op_errno = 0;
@@ -2827,7 +2815,6 @@ client3_1_unlink (call_frame_t *frame, xlator_t *this,
memcpy (req.pargfid, args->loc->parent->gfid, 16);
req.path = (char *)args->loc->path;
req.bname = (char *)args->loc->name;
- req.gfs_id = GFS3_OP_UNLINK;
conf = this->private;
ret = client_submit_request (this, &req, frame, conf->fops,
@@ -2853,7 +2840,7 @@ client3_1_rmdir (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_rmdir_req req = {0,};
+ gfs3_rmdir_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -2868,7 +2855,6 @@ client3_1_rmdir (call_frame_t *frame, xlator_t *this,
memcpy (req.pargfid, args->loc->parent->gfid, 16);
req.path = (char *)args->loc->path;
req.bname = (char *)args->loc->name;
- req.gfs_id = GFS3_OP_RMDIR;
conf = this->private;
ret = client_submit_request (this, &req, frame, conf->fops,
@@ -2894,7 +2880,7 @@ client3_1_symlink (call_frame_t *frame, xlator_t *this,
clnt_local_t *local = NULL;
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_symlink_req req = {0,};
+ gfs3_symlink_req req = {{0,},};
size_t dict_len = 0;
int ret = 0;
int op_errno = ESTALE;
@@ -2919,7 +2905,6 @@ client3_1_symlink (call_frame_t *frame, xlator_t *this,
req.path = (char *)args->loc->path;
req.linkname = (char *)args->linkname;
req.bname = (char *)args->loc->name;
- req.gfs_id = GFS3_OP_SYMLINK;
if (args->dict) {
ret = dict_allocate_and_serialize (args->dict,
&req.dict.dict_val,
@@ -2969,7 +2954,7 @@ client3_1_rename (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_rename_req req = {0,};
+ gfs3_rename_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -2989,7 +2974,6 @@ client3_1_rename (call_frame_t *frame, xlator_t *this,
req.oldbname = (char *)args->oldloc->name;
req.newpath = (char *)args->newloc->path;
req.newbname = (char *)args->newloc->name;
- req.gfs_id = GFS3_OP_RENAME;
conf = this->private;
ret = client_submit_request (this, &req, frame, conf->fops,
@@ -3015,7 +2999,7 @@ client3_1_link (call_frame_t *frame, xlator_t *this,
clnt_local_t *local = NULL;
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_link_req req = {0,};
+ gfs3_link_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -3043,7 +3027,6 @@ client3_1_link (call_frame_t *frame, xlator_t *this,
req.oldpath = (char *)args->oldloc->path;
req.newpath = (char *)args->newloc->path;
req.newbname = (char *)args->newloc->name;
- req.gfs_id = GFS3_OP_LINK;
conf = this->private;
ret = client_submit_request (this, &req, frame, conf->fops,
@@ -3068,7 +3051,7 @@ client3_1_mknod (call_frame_t *frame, xlator_t *this,
clnt_local_t *local = NULL;
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_mknod_req req = {0,};
+ gfs3_mknod_req req = {{0,},};
size_t dict_len = 0;
int ret = 0;
int op_errno = ESTALE;
@@ -3095,7 +3078,6 @@ client3_1_mknod (call_frame_t *frame, xlator_t *this,
req.bname = (char *)args->loc->name;
req.mode = args->mode;
req.dev = args->rdev;
- req.gfs_id = GFS3_OP_MKNOD;
if (args->dict) {
ret = dict_allocate_and_serialize (args->dict,
&req.dict.dict_val,
@@ -3146,7 +3128,7 @@ client3_1_mkdir (call_frame_t *frame, xlator_t *this,
clnt_local_t *local = NULL;
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_mkdir_req req = {0,};
+ gfs3_mkdir_req req = {{0,},};
size_t dict_len = 0;
int ret = 0;
int op_errno = ESTALE;
@@ -3172,7 +3154,6 @@ client3_1_mkdir (call_frame_t *frame, xlator_t *this,
req.path = (char *)args->loc->path;
req.bname = (char *)args->loc->name;
req.mode = args->mode;
- req.gfs_id = GFS3_OP_MKDIR;
if (args->dict) {
ret = dict_allocate_and_serialize (args->dict,
&req.dict.dict_val,
@@ -3222,7 +3203,7 @@ client3_1_create (call_frame_t *frame, xlator_t *this,
clnt_local_t *local = NULL;
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_create_req req = {0,};
+ gfs3_create_req req = {{0,},};
size_t dict_len = 0;
int ret = 0;
int op_errno = ESTALE;
@@ -3251,7 +3232,6 @@ client3_1_create (call_frame_t *frame, xlator_t *this,
req.bname = (char *)args->loc->name;
req.mode = args->mode;
req.flags = gf_flags_from_flags (args->flags);
- req.gfs_id = GFS3_OP_CREATE;
if (args->dict) {
ret = dict_allocate_and_serialize (args->dict,
&req.dict.dict_val,
@@ -3302,7 +3282,7 @@ client3_1_open (call_frame_t *frame, xlator_t *this,
clnt_local_t *local = NULL;
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_open_req req = {0,};
+ gfs3_open_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -3329,7 +3309,6 @@ client3_1_open (call_frame_t *frame, xlator_t *this,
req.flags = gf_flags_from_flags (args->flags);
req.wbflags = args->wbflags;
req.path = (char *)args->loc->path;
- req.gfs_id = GFS3_OP_OPEN;
conf = this->private;
@@ -3362,7 +3341,7 @@ client3_1_readv (call_frame_t *frame, xlator_t *this,
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
int op_errno = ESTALE;
- gfs3_read_req req = {0,};
+ gfs3_read_req req = {{0,},};
int ret = 0;
struct iovec rsp_vec = {0, };
struct iobuf *rsp_iobuf = NULL;
@@ -3399,7 +3378,6 @@ client3_1_readv (call_frame_t *frame, xlator_t *this,
req.size = args->size;
req.offset = args->offset;
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_READ;
rsp_iobuf = iobuf_get (this->ctx->iobuf_pool);
if (rsp_iobuf == NULL) {
@@ -3473,7 +3451,7 @@ client3_1_writev (call_frame_t *frame, xlator_t *this, void *data)
clnt_args_t *args = NULL;
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
- gfs3_write_req req = {0,};
+ gfs3_write_req req = {{0,},};
int op_errno = ESTALE;
int ret = 0;
@@ -3507,7 +3485,6 @@ client3_1_writev (call_frame_t *frame, xlator_t *this, void *data)
req.size = args->size;
req.offset = args->offset;
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_WRITE;
ret = client_submit_vec_request (this, &req, frame, conf->fops, GFS3_OP_WRITE,
client3_1_writev_cbk,
@@ -3528,7 +3505,7 @@ client3_1_flush (call_frame_t *frame, xlator_t *this,
void *data)
{
clnt_args_t *args = NULL;
- gfs3_flush_req req = {0,};
+ gfs3_flush_req req = {{0,},};
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
clnt_local_t *local = NULL;
@@ -3578,7 +3555,6 @@ client3_1_flush (call_frame_t *frame, xlator_t *this,
frame->local = local;
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_FLUSH;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_FLUSH, client3_1_flush_cbk, NULL,
@@ -3601,7 +3577,7 @@ client3_1_fsync (call_frame_t *frame, xlator_t *this,
void *data)
{
clnt_args_t *args = NULL;
- gfs3_fsync_req req = {0,};
+ gfs3_fsync_req req = {{0,},};
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
int op_errno = 0;
@@ -3636,7 +3612,6 @@ client3_1_fsync (call_frame_t *frame, xlator_t *this,
req.fd = fdctx->remote_fd;
req.data = args->flags;
- req.gfs_id = GFS3_OP_FSYNC;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_FSYNC, client3_1_fsync_cbk, NULL,
@@ -3659,7 +3634,7 @@ client3_1_fstat (call_frame_t *frame, xlator_t *this,
void *data)
{
clnt_args_t *args = NULL;
- gfs3_fstat_req req = {0,};
+ gfs3_fstat_req req = {{0,},};
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
int op_errno = ESTALE;
@@ -3693,7 +3668,6 @@ client3_1_fstat (call_frame_t *frame, xlator_t *this,
}
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_FSTAT;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_FSTAT, client3_1_fstat_cbk, NULL,
@@ -3718,7 +3692,7 @@ client3_1_opendir (call_frame_t *frame, xlator_t *this,
clnt_local_t *local = NULL;
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_opendir_req req = {0,};
+ gfs3_opendir_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -3741,7 +3715,6 @@ client3_1_opendir (call_frame_t *frame, xlator_t *this,
memcpy (req.gfid, args->loc->inode->gfid, 16);
req.path = (char *)args->loc->path;
- req.gfs_id = GFS3_OP_OPENDIR;
conf = this->private;
@@ -3772,7 +3745,7 @@ client3_1_fsyncdir (call_frame_t *frame, xlator_t *this, void *data)
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
int op_errno = ESTALE;
- gfs3_fsyncdir_req req = {0,};
+ gfs3_fsyncdir_req req = {{0,},};
int ret = 0;
if (!frame || !this || !data)
@@ -3804,7 +3777,6 @@ client3_1_fsyncdir (call_frame_t *frame, xlator_t *this, void *data)
req.fd = fdctx->remote_fd;
req.data = args->flags;
- req.gfs_id = GFS3_OP_FSYNCDIR;
conf = this->private;
@@ -3830,7 +3802,7 @@ client3_1_statfs (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_statfs_req req = {0,};
+ gfs3_statfs_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -3848,7 +3820,6 @@ client3_1_statfs (call_frame_t *frame, xlator_t *this,
req.gfid[15] = 1;
req.path = (char *)args->loc->path;
- req.gfs_id = GFS3_OP_STATFS;
conf = this->private;
@@ -3874,7 +3845,7 @@ client3_1_setxattr (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_setxattr_req req = {0,};
+ gfs3_setxattr_req req = {{0,},};
int ret = 0;
size_t dict_len = 0;
int op_errno = ESTALE;
@@ -3902,7 +3873,6 @@ client3_1_setxattr (call_frame_t *frame, xlator_t *this,
}
req.flags = args->flags;
req.path = (char *)args->loc->path;
- req.gfs_id = GFS3_OP_SETXATTR;
conf = this->private;
@@ -3936,7 +3906,7 @@ client3_1_fsetxattr (call_frame_t *frame, xlator_t *this,
clnt_args_t *args = NULL;
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
- gfs3_fsetxattr_req req = {0,};
+ gfs3_fsetxattr_req req = {{0,},};
int op_errno = ESTALE;
int ret = 0;
size_t dict_len = 0;
@@ -3971,7 +3941,6 @@ client3_1_fsetxattr (call_frame_t *frame, xlator_t *this,
req.fd = fdctx->remote_fd;
req.flags = args->flags;
memcpy (req.gfid, args->fd->inode->gfid, 16);
- req.gfs_id = GFS3_OP_FSETXATTR;
if (args->dict) {
ret = dict_allocate_and_serialize (args->dict,
@@ -4017,7 +3986,7 @@ client3_1_fgetxattr (call_frame_t *frame, xlator_t *this,
clnt_args_t *args = NULL;
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
- gfs3_fgetxattr_req req = {0,};
+ gfs3_fgetxattr_req req = {{0,},};
int op_errno = ESTALE;
int ret = 0;
@@ -4055,7 +4024,6 @@ client3_1_fgetxattr (call_frame_t *frame, xlator_t *this,
req.name = "";
req.namelen = 0;
}
- req.gfs_id = GFS3_OP_FGETXATTR;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_FGETXATTR,
@@ -4081,7 +4049,7 @@ client3_1_getxattr (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_getxattr_req req = {0,};
+ gfs3_getxattr_req req = {{0,},};
dict_t *dict = NULL;
int ret = 0;
int32_t op_ret = 0;
@@ -4108,7 +4076,6 @@ client3_1_getxattr (call_frame_t *frame, xlator_t *this,
req.name = "";
req.namelen = 0;
}
- req.gfs_id = GFS3_OP_GETXATTR;
conf = this->private;
@@ -4159,7 +4126,7 @@ client3_1_xattrop (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_xattrop_req req = {0,};
+ gfs3_xattrop_req req = {{0,},};
int ret = 0;
size_t dict_len = 0;
int op_errno = ESTALE;
@@ -4187,7 +4154,6 @@ client3_1_xattrop (call_frame_t *frame, xlator_t *this,
}
req.flags = args->flags;
req.path = (char *)args->loc->path;
- req.gfs_id = GFS3_OP_XATTROP;
conf = this->private;
@@ -4222,7 +4188,7 @@ client3_1_fxattrop (call_frame_t *frame, xlator_t *this,
clnt_args_t *args = NULL;
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
- gfs3_fxattrop_req req = {0,};
+ gfs3_fxattrop_req req = {{0,},};
int op_errno = ESTALE;
int ret = 0;
size_t dict_len = 0;
@@ -4257,7 +4223,6 @@ client3_1_fxattrop (call_frame_t *frame, xlator_t *this,
req.fd = fdctx->remote_fd;
req.flags = args->flags;
memcpy (req.gfid, args->fd->inode->gfid, 16);
- req.gfs_id = GFS3_OP_FXATTROP;
if (args->dict) {
ret = dict_allocate_and_serialize (args->dict,
@@ -4302,7 +4267,7 @@ client3_1_removexattr (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_removexattr_req req = {0,};
+ gfs3_removexattr_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -4317,7 +4282,6 @@ client3_1_removexattr (call_frame_t *frame, xlator_t *this,
memcpy (req.gfid, args->loc->inode->gfid, 16);
req.path = (char *)args->loc->path;
req.name = (char *)args->name;
- req.gfs_id = GFS3_OP_REMOVEXATTR;
conf = this->private;
@@ -4343,7 +4307,7 @@ client3_1_lk (call_frame_t *frame, xlator_t *this,
void *data)
{
clnt_args_t *args = NULL;
- gfs3_lk_req req = {0,};
+ gfs3_lk_req req = {{0,},};
int32_t gf_cmd = 0;
int32_t gf_type = 0;
clnt_fd_ctx_t *fdctx = NULL;
@@ -4414,7 +4378,6 @@ client3_1_lk (call_frame_t *frame, xlator_t *this,
req.cmd = gf_cmd;
req.type = gf_type;
gf_flock_from_flock (&req.flock, args->flock);
- req.gfs_id = GFS3_OP_LK;
ret = client_submit_request (this, &req, frame, conf->fops, GFS3_OP_LK,
client3_1_lk_cbk, NULL, xdr_from_lk_req,
@@ -4437,7 +4400,7 @@ client3_1_inodelk (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_inodelk_req req = {0,};
+ gfs3_inodelk_req req = {{0,},};
int ret = 0;
int32_t gf_cmd = 0;
int32_t gf_type = 0;
@@ -4481,7 +4444,6 @@ client3_1_inodelk (call_frame_t *frame, xlator_t *this,
req.cmd = gf_cmd;
req.type = gf_type;
gf_flock_from_flock (&req.flock, args->flock);
- req.gfs_id = GFS3_OP_INODELK;
conf = this->private;
@@ -4508,7 +4470,7 @@ client3_1_finodelk (call_frame_t *frame, xlator_t *this,
void *data)
{
clnt_args_t *args = NULL;
- gfs3_finodelk_req req = {0,};
+ gfs3_finodelk_req req = {{0,},};
int32_t gf_cmd = 0;
int32_t gf_type = 0;
clnt_fd_ctx_t *fdctx = NULL;
@@ -4572,7 +4534,6 @@ client3_1_finodelk (call_frame_t *frame, xlator_t *this,
req.cmd = gf_cmd;
req.type = gf_type;
gf_flock_from_flock (&req.flock, args->flock);
- req.gfs_id = GFS3_OP_FINODELK;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_FINODELK,
@@ -4597,7 +4558,7 @@ client3_1_entrylk (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_entrylk_req req = {0,};
+ gfs3_entrylk_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -4619,7 +4580,6 @@ client3_1_entrylk (call_frame_t *frame, xlator_t *this,
req.name = (char *)args->basename;
req.namelen = 1;
}
- req.gfs_id = GFS3_OP_ENTRYLK;
conf = this->private;
@@ -4646,7 +4606,7 @@ client3_1_fentrylk (call_frame_t *frame, xlator_t *this,
void *data)
{
clnt_args_t *args = NULL;
- gfs3_fentrylk_req req = {0,};
+ gfs3_fentrylk_req req = {{0,},};
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
int op_errno = ESTALE;
@@ -4688,7 +4648,6 @@ client3_1_fentrylk (call_frame_t *frame, xlator_t *this,
req.name = (char *)args->basename;
req.namelen = 1;
}
- req.gfs_id = GFS3_OP_FENTRYLK;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_FENTRYLK,
@@ -4748,7 +4707,6 @@ client3_1_rchecksum (call_frame_t *frame, xlator_t *this,
req.len = args->len;
req.offset = args->offset;
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_RCHECKSUM;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_RCHECKSUM,
@@ -4775,7 +4733,7 @@ client3_1_readdir (call_frame_t *frame, xlator_t *this,
clnt_args_t *args = NULL;
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
- gfs3_readdir_req req = {0,};
+ gfs3_readdir_req req = {{0,},};
int op_errno = ESTALE;
int ret = 0;
@@ -4809,7 +4767,6 @@ client3_1_readdir (call_frame_t *frame, xlator_t *this,
req.size = args->size;
req.offset = args->offset;
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_READDIR;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_READDIR,
@@ -4833,7 +4790,7 @@ client3_1_readdirp (call_frame_t *frame, xlator_t *this,
void *data)
{
clnt_args_t *args = NULL;
- gfs3_readdirp_req req = {0,};
+ gfs3_readdirp_req req = {{0,},};
clnt_fd_ctx_t *fdctx = NULL;
clnt_conf_t *conf = NULL;
int op_errno = ESTALE;
@@ -4869,7 +4826,6 @@ client3_1_readdirp (call_frame_t *frame, xlator_t *this,
req.size = args->size;
req.offset = args->offset;
req.fd = fdctx->remote_fd;
- req.gfs_id = GFS3_OP_READDIRP;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_READDIRP,
@@ -4894,7 +4850,7 @@ client3_1_setattr (call_frame_t *frame, xlator_t *this,
{
clnt_conf_t *conf = NULL;
clnt_args_t *args = NULL;
- gfs3_setattr_req req = {0,};
+ gfs3_setattr_req req = {{0,},};
int ret = 0;
int op_errno = ESTALE;
@@ -4910,7 +4866,6 @@ client3_1_setattr (call_frame_t *frame, xlator_t *this,
req.path = (char *)args->loc->path;
req.valid = args->valid;
gf_stat_from_iatt (&req.stbuf, args->stbuf);
- req.gfs_id = GFS3_OP_SETATTR;
conf = this->private;
@@ -4970,7 +4925,6 @@ client3_1_fsetattr (call_frame_t *frame, xlator_t *this, void *data)
req.fd = fdctx->remote_fd;
req.valid = args->valid;
gf_stat_from_iatt (&req.stbuf, args->stbuf);
- req.gfs_id = GFS3_OP_FSETATTR;
ret = client_submit_request (this, &req, frame, conf->fops,
GFS3_OP_FSETATTR,
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index b148f06690d..78c27eabe7e 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -335,7 +335,7 @@ fail:
int
server_setvolume (rpcsvc_request_t *req)
{
- gf_setvolume_req args = {0,};
+ gf_setvolume_req args = {{0,},};
gf_setvolume_rsp rsp = {0,};
server_connection_t *conn = NULL;
server_conf_t *conf = NULL;
@@ -647,7 +647,6 @@ server_ping (rpcsvc_request_t *req)
{
gf_common_rsp rsp = {0,};
- rsp.gfs_id = req->gfs_id;
/* Accepted */
rsp.op_ret = 0;
diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c
index 9c0ac90cdf9..f07be9bd7c6 100644
--- a/xlators/protocol/server/src/server3_1-fops.c
+++ b/xlators/protocol/server/src/server3_1-fops.c
@@ -43,7 +43,6 @@ server_statfs_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -158,7 +157,6 @@ server_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
op_ret, strerror (op_errno));
}
out:
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -182,7 +180,6 @@ server_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -232,7 +229,6 @@ server_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -273,7 +269,6 @@ server_finodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -315,7 +310,6 @@ server_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -355,7 +349,6 @@ server_fentrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -394,7 +387,6 @@ server_access_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -416,7 +408,6 @@ server_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -460,7 +451,6 @@ server_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -500,7 +490,6 @@ server_mknod_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -538,7 +527,6 @@ server_fsyncdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -585,7 +573,6 @@ server_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
strerror (op_errno));
}
unwind:
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -607,7 +594,6 @@ server_releasedir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -646,7 +632,6 @@ server_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
rsp.fd = fd_no;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -665,7 +650,6 @@ server_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -721,7 +705,6 @@ server_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
out:
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
rsp.dict.dict_len = len;
@@ -781,7 +764,6 @@ server_fgetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
out:
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
rsp.dict.dict_len = len;
@@ -803,7 +785,6 @@ server_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -823,7 +804,6 @@ server_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -845,7 +825,6 @@ server_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -893,7 +872,6 @@ server_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -944,7 +922,6 @@ server_symlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -986,7 +963,6 @@ server_link_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1037,7 +1013,6 @@ server_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1070,7 +1045,6 @@ server_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1103,7 +1077,6 @@ server_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1136,7 +1109,6 @@ server_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1167,7 +1139,6 @@ server_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1199,7 +1170,6 @@ server_release_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1220,7 +1190,6 @@ server_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1255,7 +1224,6 @@ server_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1287,7 +1255,6 @@ server_rchecksum_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1333,7 +1300,6 @@ server_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
rsp.fd = fd_no;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1412,7 +1378,6 @@ out:
req = frame->local;
rsp.fd = fd_no;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1433,7 +1398,6 @@ server_readlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1470,7 +1434,6 @@ server_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1504,7 +1467,6 @@ server_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1552,7 +1514,6 @@ server_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -1616,7 +1577,6 @@ server_xattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
out:
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
rsp.dict.dict_len = len;
@@ -1685,7 +1645,6 @@ server_fxattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
out:
req = frame->local;
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
rsp.dict.dict_len = len;
@@ -1729,7 +1688,6 @@ server_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
}
out:
- rsp.gfs_id = req->gfs_id;
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);
@@ -2661,7 +2619,7 @@ server_stat (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_stat_req args = {0,};
+ gfs3_stat_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
if (!req)
@@ -2706,7 +2664,7 @@ server_setattr (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_setattr_req args = {0,};
+ gfs3_setattr_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
if (!req)
@@ -2796,7 +2754,7 @@ server_readlink (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_readlink_req args = {0,};
+ gfs3_readlink_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
if (!req)
@@ -2844,7 +2802,7 @@ server_create (rpcsvc_request_t *req)
call_frame_t *frame = NULL;
dict_t *params = NULL;
char *buf = NULL;
- gfs3_create_req args = {0,};
+ gfs3_create_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
char bname[SERVER_PATH_MAX] = {0,};
int ret = 0;
@@ -2940,7 +2898,7 @@ server_open (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_open_req args = {0,};
+ gfs3_open_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
if (!req)
@@ -2986,7 +2944,7 @@ server_readv (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_read_req args = {0,};
+ gfs3_read_req args = {{0,},};
if (!req)
goto out;
@@ -3028,7 +2986,7 @@ server_writev (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_write_req args = {0,};
+ gfs3_write_req args = {{0,},};
ssize_t len = 0;
int i = 0;
@@ -3097,7 +3055,7 @@ int
server_release (rpcsvc_request_t *req)
{
server_connection_t *conn = NULL;
- gfs3_release_req args = {0,};
+ gfs3_release_req args = {{0,},};
gf_common_rsp rsp = {0,};
if (!xdr_to_release_req (req->msg[0], &args)) {
@@ -3119,7 +3077,7 @@ int
server_releasedir (rpcsvc_request_t *req)
{
server_connection_t *conn = NULL;
- gfs3_releasedir_req args = {0,};
+ gfs3_releasedir_req args = {{0,},};
gf_common_rsp rsp = {0,};
if (!xdr_to_release_req (req->msg[0], &args)) {
@@ -3143,7 +3101,7 @@ server_fsync (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_fsync_req args = {0,};
+ gfs3_fsync_req args = {{0,},};
if (!req)
return 0;
@@ -3185,7 +3143,7 @@ server_flush (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_flush_req args = {0,};
+ gfs3_flush_req args = {{0,},};
if (!req)
return 0;
@@ -3226,7 +3184,7 @@ server_ftruncate (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_ftruncate_req args = {0,};
+ gfs3_ftruncate_req args = {{0,},};
if (!req)
return 0;
@@ -3267,7 +3225,7 @@ server_fstat (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_write_req args = {0,};
+ gfs3_write_req args = {{0,},};
if (!req)
return 0;
@@ -3307,7 +3265,7 @@ server_truncate (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_truncate_req args = {0,};
+ gfs3_truncate_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
if (!req)
@@ -3352,7 +3310,7 @@ server_unlink (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_unlink_req args = {0,};
+ gfs3_unlink_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
char bname[SERVER_PATH_MAX] = {0,};
@@ -3402,7 +3360,7 @@ server_setxattr (rpcsvc_request_t *req)
call_frame_t *frame = NULL;
server_connection_t *conn = NULL;
char *buf = NULL;
- gfs3_setxattr_req args = {0,};
+ gfs3_setxattr_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
char dict_val[(16 * 1024)] = {0, };
int32_t ret = -1;
@@ -3487,7 +3445,7 @@ server_fsetxattr (rpcsvc_request_t *req)
server_connection_t *conn = NULL;
call_frame_t *frame = NULL;
char *buf = NULL;
- gfs3_fsetxattr_req args = {0,};
+ gfs3_fsetxattr_req args = {{0,},};
char dict_val[(16 *1024)] = {0,};
int32_t ret = -1;
@@ -3565,7 +3523,7 @@ server_fxattrop (rpcsvc_request_t *req)
server_connection_t *conn = NULL;
call_frame_t *frame = NULL;
char *buf = NULL;
- gfs3_fxattrop_req args = {0,};
+ gfs3_fxattrop_req args = {{0,},};
char dict_val[(16 *1024)] = {0,};
int32_t ret = -1;
@@ -3645,7 +3603,7 @@ server_xattrop (rpcsvc_request_t *req)
server_connection_t *conn = NULL;
call_frame_t *frame = NULL;
char *buf = NULL;
- gfs3_xattrop_req args = {0,};
+ gfs3_xattrop_req args = {{0,},};
char dict_val[(16 *1024)] = {0,};
char path[SERVER_PATH_MAX] = {0,};
int32_t ret = -1;
@@ -3722,7 +3680,7 @@ server_getxattr (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_getxattr_req args = {0,};
+ gfs3_getxattr_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
char name[4096] = {0,};
@@ -3771,7 +3729,7 @@ server_fgetxattr (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_fgetxattr_req args = {0,};
+ gfs3_fgetxattr_req args = {{0,},};
char name[4096] = {0,};
if (!req)
@@ -3817,7 +3775,7 @@ server_removexattr (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_removexattr_req args = {0,};
+ gfs3_removexattr_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
char name[4096] = {0,};
@@ -3865,7 +3823,7 @@ server_opendir (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_opendir_req args = {0,};
+ gfs3_opendir_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
if (!req)
@@ -3909,7 +3867,7 @@ server_readdirp (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_readdirp_req args = {0,};
+ gfs3_readdirp_req args = {{0,},};
size_t headers_size = 0;
if (!req)
@@ -3961,7 +3919,7 @@ server_readdir (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_readdir_req args = {0,};
+ gfs3_readdir_req args = {{0,},};
size_t headers_size = 0;
if (!req)
@@ -4013,7 +3971,7 @@ server_fsyncdir (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_fsyncdir_req args = {0,};
+ gfs3_fsyncdir_req args = {{0,},};
if (!req)
return 0;
@@ -4057,7 +4015,7 @@ server_mknod (rpcsvc_request_t *req)
call_frame_t *frame = NULL;
dict_t *params = NULL;
char *buf = NULL;
- gfs3_mknod_req args = {0,};
+ gfs3_mknod_req args = {{0,},};
char bname[SERVER_PATH_MAX] = {0,};
char path[SERVER_PATH_MAX] = {0,};
int ret = 0;
@@ -4159,7 +4117,7 @@ server_mkdir (rpcsvc_request_t *req)
call_frame_t *frame = NULL;
dict_t *params = NULL;
char *buf = NULL;
- gfs3_mkdir_req args = {0,};
+ gfs3_mkdir_req args = {{0,},};
char bname[SERVER_PATH_MAX] = {0,};
char path[SERVER_PATH_MAX] = {0,};
int ret = 0;
@@ -4256,7 +4214,7 @@ server_rmdir (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_rmdir_req args = {0,};
+ gfs3_rmdir_req args = {{0,},};
char bname[SERVER_PATH_MAX] = {0,};
char path[SERVER_PATH_MAX] = {0,};
@@ -4304,7 +4262,7 @@ server_inodelk (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_inodelk_req args = {0,};
+ gfs3_inodelk_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
char volume[4096] = {0,};
int cmd = 0;
@@ -4380,7 +4338,7 @@ server_finodelk (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_finodelk_req args = {0,};
+ gfs3_finodelk_req args = {{0,},};
char volume[4096] = {0,};
if (!req)
@@ -4452,7 +4410,7 @@ server_entrylk (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_entrylk_req args = {0,};
+ gfs3_entrylk_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
char name[4096] = {0,};
char volume[4096] = {0,};
@@ -4506,7 +4464,7 @@ server_fentrylk (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_fentrylk_req args = {0,};
+ gfs3_fentrylk_req args = {{0,},};
char name[4096] = {0,};
char volume[4096] = {0,};
@@ -4555,7 +4513,7 @@ server_access (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_access_req args = {0,};
+ gfs3_access_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
if (!req)
@@ -4602,7 +4560,7 @@ server_symlink (rpcsvc_request_t *req)
call_frame_t *frame = NULL;
dict_t *params = NULL;
char *buf = NULL;
- gfs3_symlink_req args = {0,};
+ gfs3_symlink_req args = {{0,},};
char linkname[4096] = {0,};
char path[SERVER_PATH_MAX] = {0,};
char bname[4096] = {0,};
@@ -4701,7 +4659,7 @@ server_link (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_link_req args = {0,};
+ gfs3_link_req args = {{0,},};
char oldpath[SERVER_PATH_MAX] = {0,};
char newpath[SERVER_PATH_MAX] = {0,};
char newbname[SERVER_PATH_MAX] = {0,};
@@ -4754,7 +4712,7 @@ server_rename (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_rename_req args = {0,};
+ gfs3_rename_req args = {{0,},};
char oldpath[SERVER_PATH_MAX] = {0,};
char oldbname[SERVER_PATH_MAX] = {0,};
char newpath[SERVER_PATH_MAX] = {0,};
@@ -4809,7 +4767,7 @@ server_lk (rpcsvc_request_t *req)
server_state_t *state = NULL;
server_connection_t *conn = NULL;
call_frame_t *frame = NULL;
- gfs3_lk_req args = {0,};
+ gfs3_lk_req args = {{0,},};
if (!req)
return 0;
@@ -4934,7 +4892,6 @@ server_null (rpcsvc_request_t *req)
{
gf_common_rsp rsp = {0,};
- rsp.gfs_id = req->gfs_id;
/* Accepted */
rsp.op_ret = 0;
@@ -4952,7 +4909,7 @@ server_lookup (rpcsvc_request_t *req)
server_state_t *state = NULL;
dict_t *xattr_req = NULL;
char *buf = NULL;
- gfs3_lookup_req args = {0,};
+ gfs3_lookup_req args = {{0,},};
int ret = 0;
char path[SERVER_PATH_MAX] = {0,};
char bname[SERVER_PATH_MAX] = {0,};
@@ -5052,7 +5009,7 @@ server_statfs (rpcsvc_request_t *req)
{
server_state_t *state = NULL;
call_frame_t *frame = NULL;
- gfs3_statfs_req args = {0,};
+ gfs3_statfs_req args = {{0,},};
char path[SERVER_PATH_MAX] = {0,};
if (!req)
generated by cgit (git 2.34.1) at 2024-11-13 07:03:44 +0000