As per Bruce's review comment. squash into "nfsd41: exchange_id 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 9462876..527fadb 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2961,7 +2961,7 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, int nfserr, uint64_t minor_id = 0; if (nfserr) - goto out; + return nfserr; major_id = utsname()->nodename; major_id_sz = strlen(major_id); @@ -3001,8 +3001,7 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, int nfserr, /* Implementation id */ WRITE32(0); /* zero length nfs_impl_id4 array */ ADJUST_ARGS(); -out: - return nfserr; + return 0; } static __be32 -- 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
