From 7fa06c4ce1a44bbd89d3798193f173c057533bb6 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Wed, 15 Feb 2012 19:48:50 +0530 Subject: 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 BUG: 790298 Reviewed-on: http://review.gluster.com/2756 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- xlators/protocol/client/src/client3_1-fops.c | 4 ---- xlators/protocol/server/src/server3_1-fops.c | 8 -------- 2 files changed, 12 deletions(-) (limited to 'xlators/protocol') diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c index e57373419ae..234b0dd6e03 100644 --- a/xlators/protocol/client/src/client3_1-fops.c +++ b/xlators/protocol/client/src/client3_1-fops.c @@ -2999,9 +2999,7 @@ client3_1_rename (call_frame_t *frame, xlator_t *this, GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, !uuid_is_null (*((uuid_t*)req.newgfid)), unwind, op_errno, EINVAL); - req.oldpath = (char *)args->oldloc->path; req.oldbname = (char *)args->oldloc->name; - req.newpath = (char *)args->newloc->path; req.newbname = (char *)args->newloc->name; conf = this->private; @@ -3067,8 +3065,6 @@ client3_1_link (call_frame_t *frame, xlator_t *this, loc_copy (&local->loc, args->oldloc); frame->local = local; - req.oldpath = (char *)args->oldloc->path; - req.newpath = (char *)args->newloc->path; req.newbname = (char *)args->newloc->name; conf = this->private; diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c index 90f70256943..3dae07b0385 100644 --- a/xlators/protocol/server/src/server3_1-fops.c +++ b/xlators/protocol/server/src/server3_1-fops.c @@ -4598,8 +4598,6 @@ server_link (rpcsvc_request_t *req) if (!req) return ret; - args.oldpath = alloca (req->msg[0].iov_len); - args.newpath = alloca (req->msg[0].iov_len); args.newbname = alloca (req->msg[0].iov_len); if (!xdr_to_generic (req->msg[0], &args, (xdrproc_t)xdr_gfs3_link_req)) { @@ -4624,11 +4622,9 @@ server_link (rpcsvc_request_t *req) } state->resolve.type = RESOLVE_MUST; - state->resolve.path = gf_strdup (args.oldpath); memcpy (state->resolve.gfid, args.oldgfid, 16); state->resolve2.type = RESOLVE_NOT; - state->resolve2.path = gf_strdup (args.newpath); state->resolve2.bname = gf_strdup (args.newbname); memcpy (state->resolve2.pargfid, args.newgfid, 16); @@ -4650,9 +4646,7 @@ server_rename (rpcsvc_request_t *req) if (!req) return ret; - args.oldpath = alloca (req->msg[0].iov_len); args.oldbname = alloca (req->msg[0].iov_len); - args.newpath = alloca (req->msg[0].iov_len); args.newbname = alloca (req->msg[0].iov_len); if (!xdr_to_generic (req->msg[0], &args, (xdrproc_t)xdr_gfs3_rename_req)) { @@ -4677,12 +4671,10 @@ server_rename (rpcsvc_request_t *req) } state->resolve.type = RESOLVE_MUST; - state->resolve.path = gf_strdup (args.oldpath); state->resolve.bname = gf_strdup (args.oldbname); memcpy (state->resolve.pargfid, args.oldgfid, 16); state->resolve2.type = RESOLVE_MAY; - state->resolve2.path = gf_strdup (args.newpath); state->resolve2.bname = gf_strdup (args.newbname); memcpy (state->resolve2.pargfid, args.newgfid, 16); -- cgit