diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-02-03 16:31:42 -0500 |
|---|---|---|
| committer | Show Liu <show.liu@linaro.org> | 2014-06-18 11:40:30 +0800 |
| commit | 7b8814836020d74eca48c3252663e79ddc320bd7 (patch) | |
| tree | 310507d1f3f32c34d3103ea5540484adf18ddf41 /fs | |
| parent | 0c3aa91f1531e5aa8c3cfa6f21bc051a54424b2c (diff) | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 668bfe1fcde..d21435976a0 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); |