summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2017-04-07 14:14:58 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-04-20 13:39:32 -0400
commit56938bb77a5f2cfa8c5d99029022ed2bbc0aef4a (patch)
tree6684157df0fa058d837eb98e2387972cf8517c9a
parentbe55f1bca7cf1021a1f4417e2d5f48bdc32e0bd2 (diff)
downloadop-kernel-dev-56938bb77a5f2cfa8c5d99029022ed2bbc0aef4a.zip
op-kernel-dev-56938bb77a5f2cfa8c5d99029022ed2bbc0aef4a.tar.gz
NFS: Clean up decode_getattr_args()
Removing the dprintk() lets us return the status value directly, rather than jumping to a label if an error occurs. Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--fs/nfs/callback_xdr.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index d051fc3..c782261 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -192,11 +192,8 @@ static __be32 decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr
status = decode_fh(xdr, &args->fh);
if (unlikely(status != 0))
- goto out;
- status = decode_bitmap(xdr, args->bitmap);
-out:
- dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
- return status;
+ return status;
+ return decode_bitmap(xdr, args->bitmap);
}
static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, struct cb_recallargs *args)
OpenPOWER on IntegriCloud