diff options
| author | Benny Halevy <bhalevy@panasas.com> | 2011-01-13 10:25:31 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-02-14 16:35:18 +0100 |
| commit | 0af3f814ccf0a13d3e01e8115b96f1824379fc72 (patch) | |
| tree | e5d3fb53f7cd0ed0ceb66e1991e6e7791b63e024 /fs/nfsd/nfs4callback.c | |
| parent | nfsd: don't leak dentry count on mnt_want_write failure (diff) | |
| download | linux-0af3f814ccf0a13d3e01e8115b96f1824379fc72.tar.xz linux-0af3f814ccf0a13d3e01e8115b96f1824379fc72.zip | |
NFSD: use nfserr for status after decode_cb_op_status
Bugs introduced in 85a56480191ca9f08fc775c129b9eb5c8c1f2c05
"NFSD: Update XDR decoders in NFSv4 callback client"
Cc: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
| -rw-r--r-- | fs/nfsd/nfs4callback.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 3be975e18919..cde36cb0f348 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -484,7 +484,7 @@ static int decode_cb_sequence4res(struct xdr_stream *xdr, out: return status; out_default: - return nfs_cb_stat_to_errno(status); + return nfs_cb_stat_to_errno(nfserr); } /* @@ -564,11 +564,9 @@ static int nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, if (unlikely(status)) goto out; if (unlikely(nfserr != NFS4_OK)) - goto out_default; + status = nfs_cb_stat_to_errno(nfserr); out: return status; -out_default: - return nfs_cb_stat_to_errno(status); } /* |