diff options
author | J. Bruce Fields <bfields@redhat.com> | 2014-02-03 16:31:42 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-06 10:55:29 -0400 |
commit | 5aad7571c2cf4366b1b80c7d22446458fe75f629 (patch) | |
tree | 39916feb02c4018e741d200ed9b97b7ecca371ed /fs/nfsd | |
parent | f4a0a32b202fd49d255bfc689828f0a79d364866 (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/nfsd')
-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 d7ea1938cdee..5188a38fef06 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
@@ -3384,6 +3384,9 @@ nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, __be32 nfserr, | |||
3384 | struct nfsd4_test_stateid_id *stateid, *next; | 3384 | struct nfsd4_test_stateid_id *stateid, *next; |
3385 | __be32 *p; | 3385 | __be32 *p; |
3386 | 3386 | ||
3387 | if (nfserr) | ||
3388 | return nfserr; | ||
3389 | |||
3387 | RESERVE_SPACE(4 + (4 * test_stateid->ts_num_ids)); | 3390 | RESERVE_SPACE(4 + (4 * test_stateid->ts_num_ids)); |
3388 | *p++ = htonl(test_stateid->ts_num_ids); | 3391 | *p++ = htonl(test_stateid->ts_num_ids); |
3389 | 3392 | ||