diff options
-rw-r--r-- | rpc/xdr/src/glusterfs3-xdr.c | 42 | ||||
-rw-r--r-- | rpc/xdr/src/glusterfs3-xdr.h | 21 | ||||
-rw-r--r-- | rpc/xdr/src/glusterfs3-xdr.x | 21 | ||||
-rw-r--r-- | xlators/protocol/client/src/client-handshake.c | 2 | ||||
-rw-r--r-- | xlators/protocol/client/src/client3_1-fops.c | 23 |
5 files changed, 2 insertions, 107 deletions
diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c index 33d1a609847..75ef044a006 100644 --- a/rpc/xdr/src/glusterfs3-xdr.c +++ b/rpc/xdr/src/glusterfs3-xdr.c @@ -249,8 +249,6 @@ xdr_gfs3_stat_req (XDR *xdrs, gfs3_stat_req *objp) if (!xdr_opaque (xdrs, objp->gfid, 16)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; @@ -283,8 +281,6 @@ xdr_gfs3_readlink_req (XDR *xdrs, gfs3_readlink_req *objp) return FALSE; if (!xdr_u_int (xdrs, &objp->size)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; @@ -321,8 +317,6 @@ xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp) return FALSE; if (!xdr_u_int (xdrs, &objp->mode)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->bname, ~0)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) @@ -363,8 +357,6 @@ xdr_gfs3_mkdir_req (XDR *xdrs, gfs3_mkdir_req *objp) return FALSE; if (!xdr_u_int (xdrs, &objp->mode)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->bname, ~0)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) @@ -403,8 +395,6 @@ xdr_gfs3_unlink_req (XDR *xdrs, gfs3_unlink_req *objp) if (!xdr_opaque (xdrs, objp->pargfid, 16)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->bname, ~0)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) @@ -441,8 +431,6 @@ xdr_gfs3_rmdir_req (XDR *xdrs, gfs3_rmdir_req *objp) return FALSE; if (!xdr_int (xdrs, &objp->flags)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->bname, ~0)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) @@ -477,8 +465,6 @@ xdr_gfs3_symlink_req (XDR *xdrs, gfs3_symlink_req *objp) if (!xdr_opaque (xdrs, objp->pargfid, 16)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->bname, ~0)) return FALSE; if (!xdr_string (xdrs, &objp->linkname, ~0)) @@ -611,8 +597,6 @@ xdr_gfs3_truncate_req (XDR *xdrs, gfs3_truncate_req *objp) return FALSE; if (!xdr_u_quad_t (xdrs, &objp->offset)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; @@ -649,8 +633,6 @@ xdr_gfs3_open_req (XDR *xdrs, gfs3_open_req *objp) return FALSE; if (!xdr_u_int (xdrs, &objp->wbflags)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; @@ -725,8 +707,6 @@ xdr_gfs3_lookup_req (XDR *xdrs, gfs3_lookup_req *objp) return FALSE; if (!xdr_u_int (xdrs, &objp->flags)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->bname, ~0)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) @@ -805,8 +785,6 @@ xdr_gfs3_statfs_req (XDR *xdrs, gfs3_statfs_req *objp) if (!xdr_opaque (xdrs, objp->gfid, 16)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; @@ -881,8 +859,6 @@ xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp) return FALSE; if (!xdr_gf_proto_flock (xdrs, &objp->flock)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->volume, ~0)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) @@ -976,8 +952,6 @@ xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; @@ -1014,8 +988,6 @@ xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; @@ -1084,8 +1056,6 @@ xdr_gfs3_getxattr_req (XDR *xdrs, gfs3_getxattr_req *objp) return FALSE; if (!xdr_u_int (xdrs, &objp->namelen)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->name, ~0)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) @@ -1154,8 +1124,6 @@ xdr_gfs3_removexattr_req (XDR *xdrs, gfs3_removexattr_req *objp) if (!xdr_opaque (xdrs, objp->gfid, 16)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->name, ~0)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) @@ -1188,8 +1156,6 @@ xdr_gfs3_opendir_req (XDR *xdrs, gfs3_opendir_req *objp) if (!xdr_opaque (xdrs, objp->gfid, 16)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; @@ -1303,8 +1269,6 @@ xdr_gfs3_access_req (XDR *xdrs, gfs3_access_req *objp) return FALSE; if (!xdr_u_int (xdrs, &objp->mask)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; @@ -1322,8 +1286,6 @@ xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp) return FALSE; if (!xdr_u_int (xdrs, &objp->mode)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->bname, ~0)) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) @@ -1438,8 +1400,6 @@ xdr_gfs3_entrylk_req (XDR *xdrs, gfs3_entrylk_req *objp) return FALSE; if (!xdr_u_quad_t (xdrs, &objp->namelen)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_string (xdrs, &objp->name, ~0)) return FALSE; if (!xdr_string (xdrs, &objp->volume, ~0)) @@ -1486,8 +1446,6 @@ xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp) return FALSE; if (!xdr_int (xdrs, &objp->valid)) return FALSE; - if (!xdr_string (xdrs, &objp->path, ~0)) - return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0)) return FALSE; return TRUE; diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h index 0b631e786ae..17628056a72 100644 --- a/rpc/xdr/src/glusterfs3-xdr.h +++ b/rpc/xdr/src/glusterfs3-xdr.h @@ -93,7 +93,6 @@ typedef struct gf_iatt gf_iatt; struct gfs3_stat_req { char gfid[16]; - char *path; struct { u_int xdata_len; char *xdata_val; @@ -115,7 +114,6 @@ typedef struct gfs3_stat_rsp gfs3_stat_rsp; struct gfs3_readlink_req { char gfid[16]; u_int size; - char *path; struct { u_int xdata_len; char *xdata_val; @@ -139,7 +137,6 @@ struct gfs3_mknod_req { char pargfid[16]; u_quad_t dev; u_int mode; - char *path; char *bname; struct { u_int dict_len; @@ -168,7 +165,6 @@ typedef struct gfs3_mknod_rsp gfs3_mknod_rsp; struct gfs3_mkdir_req { char pargfid[16]; u_int mode; - char *path; char *bname; struct { u_int dict_len; @@ -196,7 +192,6 @@ typedef struct gfs3_mkdir_rsp gfs3_mkdir_rsp; struct gfs3_unlink_req { char pargfid[16]; - char *path; char *bname; struct { u_int xdata_len; @@ -220,7 +215,6 @@ typedef struct gfs3_unlink_rsp gfs3_unlink_rsp; struct gfs3_rmdir_req { char pargfid[16]; int flags; - char *path; char *bname; struct { u_int xdata_len; @@ -243,7 +237,6 @@ typedef struct gfs3_rmdir_rsp gfs3_rmdir_rsp; struct gfs3_symlink_req { char pargfid[16]; - char *path; char *bname; char *linkname; struct { @@ -328,7 +321,6 @@ typedef struct gfs3_link_rsp gfs3_link_rsp; struct gfs3_truncate_req { char gfid[16]; u_quad_t offset; - char *path; struct { u_int xdata_len; char *xdata_val; @@ -352,7 +344,6 @@ struct gfs3_open_req { char gfid[16]; u_int flags; u_int wbflags; - char *path; struct { u_int xdata_len; char *xdata_val; @@ -400,7 +391,6 @@ struct gfs3_lookup_req { char gfid[16]; char pargfid[16]; u_int flags; - char *path; char *bname; struct { u_int dict_len; @@ -456,7 +446,6 @@ typedef struct gfs3_write_rsp gfs3_write_rsp; struct gfs3_statfs_req { char gfid[16]; - char *path; struct { u_int xdata_len; char *xdata_val; @@ -504,7 +493,6 @@ struct gfs3_inodelk_req { u_int cmd; u_int type; struct gf_proto_flock flock; - char *path; char *volume; struct { u_int xdata_len; @@ -567,7 +555,6 @@ struct gfs3_setxattr_req { u_int dict_len; char *dict_val; } dict; - char *path; struct { u_int xdata_len; char *xdata_val; @@ -597,7 +584,6 @@ struct gfs3_xattrop_req { u_int dict_len; char *dict_val; } dict; - char *path; struct { u_int xdata_len; char *xdata_val; @@ -651,7 +637,6 @@ typedef struct gfs3_fxattrop_rsp gfs3_fxattrop_rsp; struct gfs3_getxattr_req { char gfid[16]; u_int namelen; - char *path; char *name; struct { u_int xdata_len; @@ -702,7 +687,6 @@ typedef struct gfs3_fgetxattr_rsp gfs3_fgetxattr_rsp; struct gfs3_removexattr_req { char gfid[16]; - char *path; char *name; struct { u_int xdata_len; @@ -724,7 +708,6 @@ typedef struct gfs3_fremovexattr_req gfs3_fremovexattr_req; struct gfs3_opendir_req { char gfid[16]; - char *path; struct { u_int xdata_len; char *xdata_val; @@ -799,7 +782,6 @@ typedef struct gf_setvolume_rsp gf_setvolume_rsp; struct gfs3_access_req { char gfid[16]; u_int mask; - char *path; struct { u_int xdata_len; char *xdata_val; @@ -811,7 +793,6 @@ struct gfs3_create_req { char pargfid[16]; u_int flags; u_int mode; - char *path; char *bname; struct { u_int dict_len; @@ -887,7 +868,6 @@ struct gfs3_entrylk_req { u_int cmd; u_int type; u_quad_t namelen; - char *path; char *name; char *volume; struct { @@ -916,7 +896,6 @@ struct gfs3_setattr_req { char gfid[16]; struct gf_iatt stbuf; int valid; - char *path; struct { u_int xdata_len; char *xdata_val; diff --git a/rpc/xdr/src/glusterfs3-xdr.x b/rpc/xdr/src/glusterfs3-xdr.x index 89b5d34e517..651190c19a5 100644 --- a/rpc/xdr/src/glusterfs3-xdr.x +++ b/rpc/xdr/src/glusterfs3-xdr.x @@ -45,7 +45,6 @@ struct gf_iatt { struct gfs3_stat_req { opaque gfid[16]; - string path<>; /* NULL terminated */ opaque xdata<>; /* Extra data */ }; struct gfs3_stat_rsp { @@ -59,7 +58,6 @@ struct gfs3_stat_rsp { struct gfs3_readlink_req { opaque gfid[16]; unsigned int size; - string path<>; /* NULL terminated */ opaque xdata<>; /* Extra data */ } ; struct gfs3_readlink_rsp { @@ -75,7 +73,6 @@ struct gfs3_readlink_req { opaque pargfid[16]; unsigned hyper dev; unsigned int mode; - string path<>; /* NULL terminated */ string bname<>; /* NULL terminated */ opaque dict<>; opaque xdata<>; /* Extra data */ @@ -93,7 +90,6 @@ struct gfs3_readlink_req { struct gfs3_mkdir_req { opaque pargfid[16]; unsigned int mode; - string path<>; /* NULL terminated */ string bname<>; /* NULL terminated */ opaque dict<>; opaque xdata<>; /* Extra data */ @@ -110,7 +106,6 @@ struct gfs3_readlink_req { struct gfs3_unlink_req { opaque pargfid[16]; - string path<>; /* NULL terminated */ string bname<>; /* NULL terminated */ opaque xdata<>; /* Extra data */ }; @@ -126,7 +121,6 @@ struct gfs3_readlink_req { struct gfs3_rmdir_req { opaque pargfid[16]; int flags; - string path<>; string bname<>; /* NULL terminated */ opaque xdata<>; /* Extra data */ }; @@ -141,7 +135,6 @@ struct gfs3_readlink_req { struct gfs3_symlink_req { opaque pargfid[16]; - string path<>; string bname<>; string linkname<>; opaque dict<>; @@ -198,7 +191,6 @@ struct gfs3_readlink_req { struct gfs3_truncate_req { opaque gfid[16]; unsigned hyper offset; - string path<>; opaque xdata<>; /* Extra data */ }; struct gfs3_truncate_rsp { @@ -214,7 +206,6 @@ struct gfs3_readlink_req { opaque gfid[16]; unsigned int flags; unsigned int wbflags; - string path<>; opaque xdata<>; /* Extra data */ }; struct gfs3_open_rsp { @@ -245,7 +236,6 @@ struct gfs3_lookup_req { opaque gfid[16]; opaque pargfid[16]; unsigned int flags; - string path<>; string bname<>; opaque dict<>; opaque xdata<>; /* Extra data */ @@ -280,7 +270,6 @@ struct gfs3_lookup_req { struct gfs3_statfs_req { opaque gfid[16]; - string path<>; opaque xdata<>; /* Extra data */ } ; struct gfs3_statfs_rsp { @@ -310,7 +299,6 @@ struct gfs3_lookup_req { unsigned int cmd; unsigned int type; struct gf_proto_flock flock; - string path<>; string volume<>; opaque xdata<>; /* Extra data */ } ; @@ -352,7 +340,6 @@ struct gfs3_finodelk_req { opaque gfid[16]; unsigned int flags; opaque dict<>; - string path<>; opaque xdata<>; /* Extra data */ } ; @@ -372,7 +359,6 @@ struct gfs3_finodelk_req { opaque gfid[16]; unsigned int flags; opaque dict<>; - string path<>; opaque xdata<>; /* Extra data */ } ; @@ -403,7 +389,6 @@ struct gfs3_finodelk_req { struct gfs3_getxattr_req { opaque gfid[16]; unsigned int namelen; - string path<>; string name<>; opaque xdata<>; /* Extra data */ } ; @@ -432,7 +417,6 @@ struct gfs3_finodelk_req { struct gfs3_removexattr_req { opaque gfid[16]; - string path<>; string name<>; opaque xdata<>; /* Extra data */ } ; @@ -448,7 +432,6 @@ struct gfs3_finodelk_req { struct gfs3_opendir_req { opaque gfid[16]; - string path<>; opaque xdata<>; /* Extra data */ } ; struct gfs3_opendir_rsp { @@ -495,7 +478,6 @@ struct gfs3_finodelk_req { struct gfs3_access_req { opaque gfid[16]; unsigned int mask; - string path<>; opaque xdata<>; /* Extra data */ } ; @@ -504,7 +486,6 @@ struct gfs3_create_req { opaque pargfid[16]; unsigned int flags; unsigned int mode; - string path<>; string bname<>; opaque dict<>; opaque xdata<>; /* Extra data */ @@ -555,7 +536,6 @@ struct gfs3_fstat_req { unsigned int cmd; unsigned int type; unsigned hyper namelen; - string path<>; string name<>; string volume<>; opaque xdata<>; /* Extra data */ @@ -577,7 +557,6 @@ struct gfs3_fstat_req { opaque gfid[16]; struct gf_iatt stbuf; int valid; - string path<>; opaque xdata<>; /* Extra data */ } ; struct gfs3_setattr_rsp { diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c index be114f74050..91cda6d0c45 100644 --- a/xlators/protocol/client/src/client-handshake.c +++ b/xlators/protocol/client/src/client-handshake.c @@ -623,7 +623,6 @@ protocol_client_reopendir (xlator_t *this, clnt_fd_ctx_t *fdctx) } memcpy (req.gfid, inode->gfid, 16); - req.path = (char *)local->loc.path; gf_log (frame->this->name, GF_LOG_DEBUG, "attempting reopen on %s", local->loc.path); @@ -707,7 +706,6 @@ protocol_client_reopen (xlator_t *this, clnt_fd_ctx_t *fdctx) memcpy (req.gfid, inode->gfid, 16); req.flags = gf_flags_from_flags (fdctx->flags); req.wbflags = fdctx->wbflags; - req.path = (char *)local->loc.path; gf_log (frame->this->name, GF_LOG_DEBUG, "attempting reopen on %s", local->loc.path); diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c index 6ad646409bb..e57373419ae 100644 --- a/xlators/protocol/client/src/client3_1-fops.c +++ b/xlators/protocol/client/src/client3_1-fops.c @@ -2516,7 +2516,6 @@ client3_1_lookup (call_frame_t *frame, xlator_t *this, op_errno, unwind); } - req.path = (char *)args->loc->path; if (args->loc->name) req.bname = (char *)args->loc->name; else @@ -2595,7 +2594,6 @@ client3_1_stat (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; conf = this->private; ret = client_submit_request (this, &req, frame, conf->fops, @@ -2642,7 +2640,6 @@ client3_1_truncate (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.offset = args->offset; conf = this->private; @@ -2732,7 +2729,6 @@ client3_1_access (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.mask = args->mask; conf = this->private; @@ -2780,7 +2776,6 @@ client3_1_readlink (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.size = args->size; conf = this->private; @@ -2830,7 +2825,6 @@ client3_1_unlink (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.pargfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.bname = (char *)args->loc->name; conf = this->private; @@ -2878,7 +2872,6 @@ client3_1_rmdir (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.pargfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.bname = (char *)args->loc->name; req.flags = args->flags; conf = this->private; @@ -2935,7 +2928,6 @@ client3_1_symlink (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.pargfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.linkname = (char *)args->linkname; req.bname = (char *)args->loc->name; @@ -3133,7 +3125,6 @@ client3_1_mknod (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.pargfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.bname = (char *)args->loc->name; req.mode = args->mode; req.dev = args->rdev; @@ -3210,7 +3201,7 @@ client3_1_mkdir (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.pargfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; + req.bname = (char *)args->loc->name; req.mode = args->mode; if (args->dict) { @@ -3287,7 +3278,6 @@ client3_1_create (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.pargfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.bname = (char *)args->loc->name; req.mode = args->mode; req.flags = gf_flags_from_flags (args->flags); @@ -3368,7 +3358,6 @@ client3_1_open (call_frame_t *frame, xlator_t *this, unwind, op_errno, EINVAL); req.flags = gf_flags_from_flags (args->flags); req.wbflags = args->wbflags; - req.path = (char *)args->loc->path; conf = this->private; @@ -3704,7 +3693,6 @@ client3_1_opendir (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; conf = this->private; @@ -3799,7 +3787,6 @@ client3_1_statfs (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; conf = this->private; @@ -3854,7 +3841,6 @@ client3_1_setxattr (call_frame_t *frame, xlator_t *this, } req.flags = args->flags; - req.path = (char *)args->loc->path; conf = this->private; @@ -4106,7 +4092,7 @@ client3_1_getxattr (call_frame_t *frame, xlator_t *this, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); req.namelen = 1; /* Use it as a flag */ - req.path = (char *)args->loc->path; + req.name = (char *)args->name; if (!req.name) { req.name = ""; @@ -4239,7 +4225,6 @@ client3_1_xattrop (call_frame_t *frame, xlator_t *this, } req.flags = args->flags; - req.path = (char *)args->loc->path; conf = this->private; @@ -4419,7 +4404,6 @@ client3_1_removexattr (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.name = (char *)args->name; conf = this->private; @@ -4613,7 +4597,6 @@ client3_1_inodelk (call_frame_t *frame, xlator_t *this, break; } - req.path = (char *)args->loc->path; req.volume = (char *)args->volume; req.cmd = gf_cmd; req.type = gf_type; @@ -4736,7 +4719,6 @@ client3_1_entrylk (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.cmd = args->cmd_entrylk; req.type = args->type; req.volume = (char *)args->volume; @@ -5092,7 +5074,6 @@ client3_1_setattr (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.gfid)), unwind, op_errno, EINVAL); - req.path = (char *)args->loc->path; req.valid = args->valid; gf_stat_from_iatt (&req.stbuf, args->stbuf); |