As per Bruce's review comment. squash into "nfsd41: sequence operation" Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx> --- fs/nfsd/nfs4xdr.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 0084459..e2213cd 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3069,7 +3069,7 @@ nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr, ENCODE_HEAD; if (nfserr) - goto out; + return nfserr; RESERVE_SPACE(NFS4_MAX_SESSIONID_LEN + 20); WRITEMEM(seq->sessionid.data, NFS4_MAX_SESSIONID_LEN); @@ -3085,8 +3085,7 @@ nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr, WRITE32(0); ADJUST_ARGS(); -out: - return nfserr; + return 0; } #endif /* CONFIG_NFSD_V4_1 */ -- 1.6.2.1 -- 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
