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>

diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
index 6b042218668b822d63a07b6581476ea1f5db003e..c774ce9aa29652a8c2da79deaa2e2c09eb33ebb9 100644 (file)
--- 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 809729d41e08657ab7da088af33e29a5ee89f893..ea87b42894dd263719df3d42940abc2dd8850592 100644 (file)
--- 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 */