From: Chuck Lever <cel@kernel.org>
To: NeilBrown <neil@brown.name>, Jeff Layton <jlayton@kernel.org>,
Olga Kornievskaia <okorniev@redhat.com>,
Dai Ngo <dai.ngo@oracle.com>, Tom Talpey <tom@talpey.com>
Cc: <linux-nfs@vger.kernel.org>
Subject: [PATCH 3/6] NFSD: Remove two unused NFSv4 constants
Date: Fri, 17 Jul 2026 14:41:09 -0400 [thread overview]
Message-ID: <20260717184112.507548-4-cel@kernel.org> (raw)
In-Reply-To: <20260717184112.507548-1-cel@kernel.org>
Neither COMPOUND_SLACK_SPACE nor NFSD_COURTESY_CLIENT_TIMEOUT has
a remaining user. COMPOUND_SLACK_SPACE lost its last reference in
commit ea8d7720b274 ("nfsd4: remove redundant encode buffer size
checking"), which deleted the encode buffer-space check the macro
fed; the comment above it still describes that departed check.
NFSD_COURTESY_CLIENT_TIMEOUT is likewise unreferenced: the
courteous-server code expires clients through the laundromat's
reaper and conflict paths, never a fixed 24-hour timer.
Signed-off-by: Chuck Lever <cel@kernel.org>
---
fs/nfsd/nfsd.h | 7 -------
1 file changed, 7 deletions(-)
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 384a2498b6a2..27e5384cd849 100644
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -204,21 +204,14 @@ void nfsd_lockd_shutdown(void);
* 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 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 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.
*/
-#define COMPOUND_SLACK_SPACE 140 /* OP_GETFH */
#define COMPOUND_ERR_SLACK_SPACE 16 /* OP_SETATTR */
#define NFSD_LAUNDROMAT_MINTIMEOUT 1 /* seconds */
-#define NFSD_COURTESY_CLIENT_TIMEOUT (24 * 60 * 60) /* seconds */
#define NFSD_CLIENT_MAX_TRIM_PER_RUN 128
#define NFS4_CLIENTS_PER_GB 1024
#define NFSD_DELEGRETURN_TIMEOUT (HZ / 34) /* 30ms */
--
2.54.0
next prev parent reply other threads:[~2026-07-17 18:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-17 18:41 [PATCH 0/6] NFSv4-related tidying Chuck Lever
2026-07-17 18:41 ` [PATCH 1/6] NFSD: Move XDR encoding helpers out of xdr4.h Chuck Lever
2026-07-17 18:41 ` [PATCH 2/6] NFSD: Move pre-xdr'ed status codes out of nfsd.h Chuck Lever
2026-07-17 18:41 ` Chuck Lever [this message]
2026-07-17 18:41 ` [PATCH 4/6] NFSD: Relocate NFSv4-internal constants to state.h Chuck Lever
2026-07-17 18:41 ` [PATCH 5/6] NFSD: Evacuate NFSv4 entry-point prototypes from nfsd.h Chuck Lever
2026-07-17 18:41 ` [PATCH 6/6] NFSD: Move nfsd_v4client() out of nfsd.h Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260717184112.507548-4-cel@kernel.org \
--to=cel@kernel.org \
--cc=dai.ngo@oracle.com \
--cc=jlayton@kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neil@brown.name \
--cc=okorniev@redhat.com \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox