summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-02-03 16:38:47 -0500
committerJ. Bruce Fields <bfields@redhat.com>2014-03-27 16:31:09 -0400
commit04819bf6449094e62cebaf5199d85d68d711e667 (patch)
treed62664c835eec41089e4d995380fa39ca9afbe8d /fs/nfsd
parent798df3387971abf6071de77ca82b8e7775e74809 (diff)
downloadblackbird-op-linux-04819bf6449094e62cebaf5199d85d68d711e667.tar.gz
blackbird-op-linux-04819bf6449094e62cebaf5199d85d68d711e667.zip
nfsd4: leave reply buffer space for failed setattr
This fixes an ommission from 18032ca062e621e15683cb61c066ef3dc5414a7b "NFSD: Server implementation of MAC Labeling", which increased the size of the setattr error reply without increasing COMPOUND_ERR_SLACK_SPACE. Cc: stable@vger.kernel.org Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfsd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 30f34ab02137..479eb681c27c 100644
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -282,7 +282,7 @@ void nfsd_lockd_shutdown(void);
* reason.
*/
#define COMPOUND_SLACK_SPACE 140 /* OP_GETFH */
-#define COMPOUND_ERR_SLACK_SPACE 12 /* OP_SETATTR */
+#define COMPOUND_ERR_SLACK_SPACE 16 /* OP_SETATTR */
#define NFSD_LAUNDROMAT_MINTIMEOUT 1 /* seconds */
OpenPOWER on IntegriCloud