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 07:59:27 -0700 |
| commit | c48069a373b6472b2351dc43eb9afc895f430257 (patch) | |
| tree | 07b1347158245ce1a2d8765af0bb53f59e9fc253 /fs | |
| parent | d37c37d2d4d8fb671d7775d9760afde90a435cbd (diff) | |
| download | lwn-c48069a373b6472b2351dc43eb9afc895f430257.tar.gz lwn-c48069a373b6472b2351dc43eb9afc895f430257.zip | |
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 668bfe1fcdec..d21435976a02 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); |