From: J. Bruce Fields <bfields@redhat.com>
Date: Mon, 3 Feb 2014 21:31:42 +0000 (-0500)
Subject: nfsd4: fix test_stateid error reply encoding
X-Git-Tag: upstream/snapshot3+hdmi~3110
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c48069a373b6472b2351dc43eb9afc895f430257;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

nfsd4: fix test_stateid error reply encoding

commit a11fcce1544df08c723d950ff0edef3adac40405 upstream.

If the entire operation fails then there's nothing to encode.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 668bfe1..d214359 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3473,6 +3473,9 @@ nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, __be32 nfserr,
 	struct nfsd4_test_stateid_id *stateid, *next;
 	__be32 *p;
 
+	if (nfserr)
+		return nfserr;
+
 	RESERVE_SPACE(4 + (4 * test_stateid->ts_num_ids));
 	*p++ = htonl(test_stateid->ts_num_ids);