diff options
| author | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2017-04-07 14:14:59 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-04-20 13:39:32 -0400 |
| commit | 135a4ea0d9b8a3fe538c309e0073c17893e47298 (patch) | |
| tree | cfae5c81158e447109ae8a232e6e7bf11dcd51a8 /fs | |
| parent | 56938bb77a5f2cfa8c5d99029022ed2bbc0aef4a (diff) | |
| download | linux-stable-135a4ea0d9b8a3fe538c309e0073c17893e47298.tar.gz linux-stable-135a4ea0d9b8a3fe538c309e0073c17893e47298.tar.bz2 linux-stable-135a4ea0d9b8a3fe538c309e0073c17893e47298.zip | |
NFS: Clean up decode_recall_args()
Removing the dprintk() lets us simplify the function by returning status
codes directly, rather than using a goto.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/callback_xdr.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index c782261d86d5..0319230fe1a8 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -203,17 +203,12 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, status = decode_delegation_stateid(xdr, &args->stateid); if (unlikely(status != 0)) - goto out; + return status; p = read_buf(xdr, 4); - if (unlikely(p == NULL)) { - status = htonl(NFS4ERR_RESOURCE); - goto out; - } + if (unlikely(p == NULL)) + return htonl(NFS4ERR_RESOURCE); args->truncate = ntohl(*p); - status = decode_fh(xdr, &args->fh); -out: - dprintk("%s: exit with status = %d\n", __func__, ntohl(status)); - return status; + return decode_fh(xdr, &args->fh); } #if defined(CONFIG_NFS_V4_1) |