diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-11-19 07:51:17 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-12-09 11:22:20 -0500 |
| commit | 78b65eb3fda95c6d131c4bbb0536e21f0bd7a7d4 (patch) | |
| tree | 3a950b2765bef86f7ea928a9abd0f4b53e86513e /fs/nfsd/nfssvc.c | |
| parent | 30660e04b0d4bbbd15fd21098681f45a9f4080b9 (diff) | |
| download | linux-stable-78b65eb3fda95c6d131c4bbb0536e21f0bd7a7d4.tar.gz linux-stable-78b65eb3fda95c6d131c4bbb0536e21f0bd7a7d4.tar.bz2 linux-stable-78b65eb3fda95c6d131c4bbb0536e21f0bd7a7d4.zip | |
sunrpc: move rq_dropme flag into rq_flags
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfssvc.c')
| -rw-r--r-- | fs/nfsd/nfssvc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 752d56bbe0ba..314f5c8f8f1a 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -692,7 +692,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) /* Now call the procedure handler, and encode NFS status. */ nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); nfserr = map_new_errors(rqstp->rq_vers, nfserr); - if (nfserr == nfserr_dropit || rqstp->rq_dropme) { + if (nfserr == nfserr_dropit || test_bit(RQ_DROPME, &rqstp->rq_flags)) { dprintk("nfsd: Dropping request; may be revisited later\n"); nfsd_cache_update(rqstp, RC_NOCACHE, NULL); return 0; |