summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2012-02-15 19:48:50 +0530
committerAnand Avati <avati@redhat.com>2012-02-16 22:49:15 -0800
commit7fa06c4ce1a44bbd89d3798193f173c057533bb6 (patch)
treeea348fcf64aed97666ac26ce3e5380532c0ffbbe /rpc
parent47e748fe60c46d543c87f3228eb59d6580db8cf1 (diff)
protocol: remove the 'path<>' from rename() and link()
missed it in the previous round of cleanup, path is completely useless in resolve function. Change-Id: I1aef0f5276afb77dfacfcc0c337ac80b4fcacc55 Signed-off-by: Amar Tumballi <amar@gluster.com> BUG: 790298 Reviewed-on: http://review.gluster.com/2756 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/xdr/src/glusterfs3-xdr.c8
-rw-r--r--rpc/xdr/src/glusterfs3-xdr.h4
-rw-r--r--rpc/xdr/src/glusterfs3-xdr.x4
3 files changed, 0 insertions, 16 deletions
diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c
index 75ef044..8008a74 100644
--- a/rpc/xdr/src/glusterfs3-xdr.c
+++ b/rpc/xdr/src/glusterfs3-xdr.c
@@ -507,12 +507,8 @@ xdr_gfs3_rename_req (XDR *xdrs, gfs3_rename_req *objp)
return FALSE;
if (!xdr_opaque (xdrs, objp->newgfid, 16))
return FALSE;
- if (!xdr_string (xdrs, &objp->oldpath, ~0))
- return FALSE;
if (!xdr_string (xdrs, &objp->oldbname, ~0))
return FALSE;
- if (!xdr_string (xdrs, &objp->newpath, ~0))
- return FALSE;
if (!xdr_string (xdrs, &objp->newbname, ~0))
return FALSE;
if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
@@ -555,10 +551,6 @@ xdr_gfs3_link_req (XDR *xdrs, gfs3_link_req *objp)
return FALSE;
if (!xdr_opaque (xdrs, objp->newgfid, 16))
return FALSE;
- if (!xdr_string (xdrs, &objp->oldpath, ~0))
- return FALSE;
- if (!xdr_string (xdrs, &objp->newpath, ~0))
- return FALSE;
if (!xdr_string (xdrs, &objp->newbname, ~0))
return FALSE;
if (!xdr_bytes (xdrs, (char **)&objp->xdata.xdata_val, (u_int *) &objp->xdata.xdata_len, ~0))
diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h
index 1762805..2b8129a 100644
--- a/rpc/xdr/src/glusterfs3-xdr.h
+++ b/rpc/xdr/src/glusterfs3-xdr.h
@@ -266,9 +266,7 @@ typedef struct gfs3_symlink_rsp gfs3_symlink_rsp;
struct gfs3_rename_req {
char oldgfid[16];
char newgfid[16];
- char *oldpath;
char *oldbname;
- char *newpath;
char *newbname;
struct {
u_int xdata_len;
@@ -295,8 +293,6 @@ typedef struct gfs3_rename_rsp gfs3_rename_rsp;
struct gfs3_link_req {
char oldgfid[16];
char newgfid[16];
- char *oldpath;
- char *newpath;
char *newbname;
struct {
u_int xdata_len;
diff --git a/rpc/xdr/src/glusterfs3-xdr.x b/rpc/xdr/src/glusterfs3-xdr.x
index 651190c..710a903 100644
--- a/rpc/xdr/src/glusterfs3-xdr.x
+++ b/rpc/xdr/src/glusterfs3-xdr.x
@@ -153,9 +153,7 @@ struct gfs3_readlink_req {
struct gfs3_rename_req {
opaque oldgfid[16];
opaque newgfid[16];
- string oldpath<>;
string oldbname<>; /* NULL terminated */
- string newpath<>;
string newbname<>; /* NULL terminated */
opaque xdata<>; /* Extra data */
};
@@ -174,8 +172,6 @@ struct gfs3_readlink_req {
struct gfs3_link_req {
opaque oldgfid[16];
opaque newgfid[16];
- string oldpath<>;
- string newpath<>;
string newbname<>;
opaque xdata<>; /* Extra data */
};