diff options
author | Jeff Layton <jlayton@primarydata.com> | 2014-11-19 07:51:16 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-12-09 11:22:20 -0500 |
commit | 30660e04b0d4bbbd15fd21098681f45a9f4080b9 (patch) | |
tree | e331b3dab619532ee1cf37c1354e9f7246398f1a /net | |
parent | 7501cc2bcf9a71cc1f19e38775c234815ee44578 (diff) |
sunrpc: move rq_usedeferral flag to rq_flags
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/svc.c | 2 | ||||
-rw-r--r-- | net/sunrpc/svc_xprt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 163df468d6d5..f6a8f2f7a253 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
@@ -1090,7 +1090,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) | |||
1090 | /* Will be turned off only in gss privacy case: */ | 1090 | /* Will be turned off only in gss privacy case: */ |
1091 | rqstp->rq_splice_ok = true; | 1091 | rqstp->rq_splice_ok = true; |
1092 | /* Will be turned off only when NFSv4 Sessions are used */ | 1092 | /* Will be turned off only when NFSv4 Sessions are used */ |
1093 | rqstp->rq_usedeferral = true; | 1093 | set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags); |
1094 | rqstp->rq_dropme = false; | 1094 | rqstp->rq_dropme = false; |
1095 | 1095 | ||
1096 | /* Setup reply header */ | 1096 | /* Setup reply header */ |
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index eaa9263c2d28..a40f3755a33d 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c | |||
@@ -1081,7 +1081,7 @@ static struct cache_deferred_req *svc_defer(struct cache_req *req) | |||
1081 | struct svc_rqst *rqstp = container_of(req, struct svc_rqst, rq_chandle); | 1081 | struct svc_rqst *rqstp = container_of(req, struct svc_rqst, rq_chandle); |
1082 | struct svc_deferred_req *dr; | 1082 | struct svc_deferred_req *dr; |
1083 | 1083 | ||
1084 | if (rqstp->rq_arg.page_len || !rqstp->rq_usedeferral) | 1084 | if (rqstp->rq_arg.page_len || !test_bit(RQ_USEDEFERRAL, &rqstp->rq_flags)) |
1085 | return NULL; /* if more than a page, give up FIXME */ | 1085 | return NULL; /* if more than a page, give up FIXME */ |
1086 | if (rqstp->rq_deferred) { | 1086 | if (rqstp->rq_deferred) { |
1087 | dr = rqstp->rq_deferred; | 1087 | dr = rqstp->rq_deferred; |