Commit 73cc6ec1 authored Sep 08, 2025 by NeilBrown Committed by Chuck Lever Oct 01, 2025

nfsd: discard nfserr_dropit



nfserr_dropit hasn't been used for over a decade, since rq_dropme and
the RQ_DROPME were introduced.

Time to get rid of it completely.

Signed-off-by: NeilBrown <neil@brown.name>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

parent d8e97cc4

fs/nfsd/lockd.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -71,8 +71,6 @@ nlm_fopen(struct svc_rqst rqstp, struct nfs_fh f, struct file **filp,
		* to callback when the delegation is returned but might
		* not have a proper lock request to block on.
		*/
		fallthrough;
		case nfserr_dropit:
		return nlm_drop_reply;
		case nfserr_stale:
		return nlm_stale_fh;

fs/nfsd/nfsd.h

+1 −7

Original line number	Diff line number	Diff line
		@@ -344,14 +344,8 @@ void nfsd_lockd_shutdown(void);
		* cannot conflict with any existing be32 nfserr value.
		*/
		enum {
		NFSERR_DROPIT = NFS4ERR_FIRST_FREE,
		/* if a request fails due to kmalloc failure, it gets dropped.
		* Client should resend eventually
		*/
		#define nfserr_dropit cpu_to_be32(NFSERR_DROPIT)

		/* end-of-file indicator in readdir */
		NFSERR_EOF,
		NFSERR_EOF = NFS4ERR_FIRST_FREE,
		#define nfserr_eof cpu_to_be32(NFSERR_EOF)

		/* replay detected */