OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1796549
)
NFS: Clean up decode_notify_lock_args()
author
Anna Schumaker
<Anna.Schumaker@Netapp.com>
Fri, 7 Apr 2017 18:15:02 +0000
(14:15 -0400)
committer
Trond Myklebust
<trond.myklebust@primarydata.com>
Thu, 20 Apr 2017 17:39:33 +0000
(13:39 -0400)
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>
fs/nfs/callback_xdr.c
patch
|
blob
|
history
diff --git
a/fs/nfs/callback_xdr.c
b/fs/nfs/callback_xdr.c
index
ce1e293
..
4cf70dc
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 */