On Jan 13, 2011, at 4:25 AM, Benny Halevy wrote: > Bugs introduced in 85a56480191ca9f08fc775c129b9eb5c8c1f2c05 > "NFSD: Update XDR decoders in NFSv4 callback client" > > Cc: Chuck Lever <chuck.lever@xxxxxxxxxx> > Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx> > --- > 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 21a63da..5a6dcf8 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); Good fix. > } > > /* > @@ -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); Good fix, but I would rather keep the same style here that every other NFS decoder uses here. The "goto out_default" -- we want to keep the non-common cases out of the mainline code path. It is Bruce-preferred (tm) style to branch on error. > } > > /* > -- > 1.7.3.4 > -- Chuck Lever chuck[dot]lever[at]oracle[dot]com -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
