aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4proc.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-07-16 17:15:10 -0400
committerJ. Bruce Fields <bfields@redhat.com>2011-07-18 09:38:02 -0400
commit3e98abffd1665b884a322aedcd528577842f762f (patch)
tree3f94883dd56081c17e3bbfadbe196eb5cb2a7595 /fs/nfsd/nfs4proc.c
parentab1350b2b3c1dd2e465a6abdda608d8c44facfb8 (diff)
nfsd4: call nfsd4_release_compoundargs from pc_release
This simplifies cleanup a bit. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
-rw-r--r--fs/nfsd/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 121fd84e7f90..7ef1b27f1125 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1218,7 +1218,6 @@ encode_op:
1218 fh_put(&resp->cstate.save_fh); 1218 fh_put(&resp->cstate.save_fh);
1219 BUG_ON(resp->cstate.replay_owner); 1219 BUG_ON(resp->cstate.replay_owner);
1220out: 1220out:
1221 nfsd4_release_compoundargs(args);
1222 /* Reset deferral mechanism for RPC deferrals */ 1221 /* Reset deferral mechanism for RPC deferrals */
1223 rqstp->rq_usedeferral = 1; 1222 rqstp->rq_usedeferral = 1;
1224 dprintk("nfsv4 compound returned %d\n", ntohl(status)); 1223 dprintk("nfsv4 compound returned %d\n", ntohl(status));
@@ -1473,6 +1472,7 @@ static struct svc_procedure nfsd_procedures4[2] = {
1473 .pc_encode = (kxdrproc_t) nfs4svc_encode_compoundres, 1472 .pc_encode = (kxdrproc_t) nfs4svc_encode_compoundres,
1474 .pc_argsize = sizeof(struct nfsd4_compoundargs), 1473 .pc_argsize = sizeof(struct nfsd4_compoundargs),
1475 .pc_ressize = sizeof(struct nfsd4_compoundres), 1474 .pc_ressize = sizeof(struct nfsd4_compoundres),
1475 .pc_release = nfsd4_release_compoundargs,
1476 .pc_cachetype = RC_NOCACHE, 1476 .pc_cachetype = RC_NOCACHE,
1477 .pc_xdrressize = NFSD_BUFSIZE/4, 1477 .pc_xdrressize = NFSD_BUFSIZE/4,
1478 }, 1478 },