From ba8901bbc990f668455a363245589963f95162b6 Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Thu, 13 Jan 2011 11:25:31 +0200 Subject: [PATCH] --- yaml --- r: 233269 b: refs/heads/master c: 0af3f814ccf0a13d3e01e8115b96f1824379fc72 h: refs/heads/master i: 233267: 3f7770e082a7095ef26436b6fcc2cc60b6362742 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4callback.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 21f0ab8742e5..59c02162ec7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 541ce98c10111dae7604543dda6c6f7e7a6015d8 +refs/heads/master: 0af3f814ccf0a13d3e01e8115b96f1824379fc72 diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c index 3be975e18919..cde36cb0f348 100644 --- a/trunk/fs/nfsd/nfs4callback.c +++ b/trunk/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); } /*