[PATCH] knfsd: nfsd4: clarify units of COMPOUND_SLACK_SPACE

A comment here incorrectly states that "slack_space" is measured in words, not
bytes.  Remove the comment, and adjust a variable name and a few comments to
clarify the situation.

This is pure cleanup; there should be no change in functionality.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 50bc94243ca1..793a0b0a6cdd 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -740,7 +740,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
         struct svc_fh   *current_fh = NULL;
         struct svc_fh   *save_fh = NULL;
         struct nfs4_stateowner *replay_owner = NULL;
-        int             slack_space;    /* in words, not bytes! */
+        int             slack_bytes;
         __be32          status;
 
         status = nfserr_resource;
@@ -790,10 +790,10 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
                  * failed response to the next operation.  If we don't
                  * have enough room, fail with ERR_RESOURCE.
                  */
-/* FIXME - is slack_space *really* words, or bytes??? - neilb */
-                slack_space = (char *)resp->end - (char *)resp->p;
-                if (slack_space < COMPOUND_SLACK_SPACE + COMPOUND_ERR_SLACK_SPACE) {
-                        BUG_ON(slack_space < COMPOUND_ERR_SLACK_SPACE);
+                slack_bytes = (char *)resp->end - (char *)resp->p;
+                if (slack_bytes < COMPOUND_SLACK_SPACE
+                                + COMPOUND_ERR_SLACK_SPACE) {
+                        BUG_ON(slack_bytes < COMPOUND_ERR_SLACK_SPACE);
                         op->status = nfserr_resource;
                         goto encode_op;
                 }