[PATCH v2] nfsd: discard nfserr_dropit

[PATCH v2] nfsd: discard nfserr_dropit

[NeilBrown]

From: NeilBrown <neil@brown.name>

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>
---

This version updated fo recent changes to fs/nfsd/lockd.c

 fs/nfsd/lockd.c | 2 --
 fs/nfsd/nfsd.h  | 8 +-------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
index 6b042218668b..c774ce9aa296 100644
--- a/fs/nfsd/lockd.c
+++ b/fs/nfsd/lockd.c
@@ -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;
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 1cd0bed57bc2..06e8327255f8 100644
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -335,14 +335,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 */

base-commit: b8cf39957931982091e6446a98f151a79aeea07b
-- 
2.50.0.107.gf914562f5916.dirty

Re: [PATCH v2] nfsd: discard nfserr_dropit

[Chuck Lever]

From: Chuck Lever <chuck.lever@oracle.com>

On Mon, 08 Sep 2025 11:37:25 +1000, NeilBrown wrote:
> 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.
> 
> 

Applied to nfsd-testing, thanks!

[1/1] nfsd: discard nfserr_dropit
      commit: 8516b28610286dc9219371383a1a6f07c4569ca8

--
Chuck Lever

Re: [PATCH v2] nfsd: discard nfserr_dropit

[Jeff Layton]

On Mon, 2025-09-08 at 11:37 +1000, NeilBrown wrote:
> From: NeilBrown <neil@brown.name>
> 
> 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>
> ---
> 
> This version updated fo recent changes to fs/nfsd/lockd.c
> 
>  fs/nfsd/lockd.c | 2 --
>  fs/nfsd/nfsd.h  | 8 +-------
>  2 files changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
> index 6b042218668b..c774ce9aa296 100644
> --- a/fs/nfsd/lockd.c
> +++ b/fs/nfsd/lockd.c
> @@ -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;
> diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> index 1cd0bed57bc2..06e8327255f8 100644
> --- a/fs/nfsd/nfsd.h
> +++ b/fs/nfsd/nfsd.h
> @@ -335,14 +335,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 */
> 
> base-commit: b8cf39957931982091e6446a98f151a79aeea07b

Reviewed-by: Jeff Layton <jlayton@kernel.org>