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>

diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index ce1e293b8a1840cd6e02daf118895046af7e74cb..4cf70dc59933277e66b76f889678f052e1945ec7 100644 (file)
--- 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 */