diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-02-03 16:31:42 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-03-27 16:31:39 -0400 |
| commit | a11fcce1544df08c723d950ff0edef3adac40405 (patch) | |
| tree | 0364871abcd7cc1d45b05ddb829f5fb00de4701d | |
| parent | 04819bf6449094e62cebaf5199d85d68d711e667 (diff) | |
| download | linux-a11fcce1544df08c723d950ff0edef3adac40405.tar.bz2 | |
nfsd4: fix test_stateid error reply encoding
If the entire operation fails then there's nothing to encode.
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -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 de7bc8f7c106..aa04a6a98bd5 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); |