Skip to content

Commit

Permalink
NFSD: use nfserr for status after decode_cb_op_status
Browse files Browse the repository at this point in the history
Bugs introduced in 85a5648
"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>
  • Loading branch information
Benny Halevy authored and J. Bruce Fields committed Feb 14, 2011
1 parent 541ce98 commit 0af3f81
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions fs/nfsd/nfs4callback.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit 0af3f81

Please sign in to comment.