diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-11 15:10:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-11 15:10:04 -0700 |
| commit | bae78dc25993f62194ee53da67b14e3d5007c6c4 (patch) | |
| tree | f4a01c8625f086141cccd1b64e994a41cbc6ec85 /fs | |
| parent | ef24209fb21a13aceb8069db609e145789c2f500 (diff) | |
| parent | c3a4561796cffae6996264876ffca147b5c3709a (diff) | |
| download | lwn-bae78dc25993f62194ee53da67b14e3d5007c6c4.tar.gz lwn-bae78dc25993f62194ee53da67b14e3d5007c6c4.zip | |
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfix from Bruce Fields:
"Another xdr encoding regression that may cause incorrect encoding on
failures of certain readdirs"
* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix bad reserving space for encoding rdattr_error
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 2fc7abebeb9b..b56b1cc02718 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2641,7 +2641,7 @@ nfsd4_encode_rdattr_error(struct xdr_stream *xdr, __be32 nfserr) { __be32 *p; - p = xdr_reserve_space(xdr, 6); + p = xdr_reserve_space(xdr, 20); if (!p) return NULL; *p++ = htonl(2); |