summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2017-04-07 14:15:02 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-04-20 13:39:33 -0400
commit535ece2b8e4b0edf9f18be2d103d19f833fa8b7f (patch)
tree81e80dc964d9b98ddee243f11425eba5e2b21a92
parent1796549ad48c43dbe40408de39c7afcacbd43f0b (diff)
downloadop-kernel-dev-535ece2b8e4b0edf9f18be2d103d19f833fa8b7f.zip
op-kernel-dev-535ece2b8e4b0edf9f18be2d103d19f833fa8b7f.tar.gz
NFS: Clean up decode_notify_lock_args()
Let's cut out the goto and return any errors immedately 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 ce1e293..4cf70dc 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -518,11 +518,8 @@ static __be32 decode_notify_lock_args(struct svc_rqst *rqstp, struct xdr_stream
status = decode_fh(xdr, &args->cbnl_fh);
if (unlikely(status != 0))
- goto out;
- status = decode_lockowner(xdr, args);
-out:
- dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
- return status;
+ return status;
+ return decode_lockowner(xdr, args);
}
#endif /* CONFIG_NFS_V4_1 */
OpenPOWER on IntegriCloud