diff options
| author | NeilBrown <neil@brown.name> | 2025-09-08 11:37:25 +1000 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2025-10-01 15:54:01 -0400 |
| commit | 73cc6ec1a89a6c443a77b9b93ddcea63b7cea223 (patch) | |
| tree | f8918f62a4ca1fd5668bc434574745625de980b3 | |
| parent | d8e97cc476e33037ac69c5b09b351f5cc8d0589d (diff) | |
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>
| -rw-r--r-- | fs/nfsd/lockd.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/nfsd.h | 8 |
2 files changed, 1 insertions, 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 809729d41e08..ea87b42894dd 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -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 */ |