Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5710199 authored by J.Bruce Fields's avatar J.Bruce Fields Committed by Linus Torvalds
Browse files

[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: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b797b5be

fs/nfsd/nfs4proc.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

		}

include/linux/nfsd/nfsd.h

+2 −2
Original line number Diff line number Diff line
@@ -275,12 +275,12 @@ static inline int is_fsid(struct svc_fh *fh, struct knfsd_fh *reffh) 
 * we might process an operation with side effects, and be unable to

 * tell the client that the operation succeeded.

 *

 * COMPOUND_SLACK_SPACE - this is the minimum amount of buffer space

 * COMPOUND_SLACK_SPACE - this is the minimum bytes of buffer space

 * needed to encode an "ordinary" _successful_ operation.  (GETATTR,

 * READ, READDIR, and READLINK have their own buffer checks.)  if we

 * fall below this level, we fail the next operation with NFS4ERR_RESOURCE.

 *

 * COMPOUND_ERR_SLACK_SPACE - this is the minimum amount of buffer space

 * COMPOUND_ERR_SLACK_SPACE - this is the minimum bytes of buffer space

 * needed to encode an operation which has failed with NFS4ERR_RESOURCE.

 * care is taken to ensure that we never fall below this level for any

 * reason.