Skip to content

Commit 73cc6ec

Browse files
neilbrownchucklever
authored andcommitted
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 <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent d8e97cc commit 73cc6ec

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

fs/nfsd/lockd.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp,
7171
* to callback when the delegation is returned but might
7272
* not have a proper lock request to block on.
7373
*/
74-
fallthrough;
75-
case nfserr_dropit:
7674
return nlm_drop_reply;
7775
case nfserr_stale:
7876
return nlm_stale_fh;

fs/nfsd/nfsd.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -344,14 +344,8 @@ void nfsd_lockd_shutdown(void);
344344
* cannot conflict with any existing be32 nfserr value.
345345
*/
346346
enum {
347-
NFSERR_DROPIT = NFS4ERR_FIRST_FREE,
348-
/* if a request fails due to kmalloc failure, it gets dropped.
349-
* Client should resend eventually
350-
*/
351-
#define nfserr_dropit cpu_to_be32(NFSERR_DROPIT)
352-
353347
/* end-of-file indicator in readdir */
354-
NFSERR_EOF,
348+
NFSERR_EOF = NFS4ERR_FIRST_FREE,
355349
#define nfserr_eof cpu_to_be32(NFSERR_EOF)
356350

357351
/* replay detected */

0 commit comments

Comments
 (0)