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 /fs/nfsd | |
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 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 74fb15eefc31..6f98393ad0d9 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c | |||
@@ -1370,7 +1370,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, | |||
1370 | * Don't use the deferral mechanism for NFSv4; compounds make it | 1370 | * Don't use the deferral mechanism for NFSv4; compounds make it |
1371 | * too hard to avoid non-idempotency problems. | 1371 | * too hard to avoid non-idempotency problems. |
1372 | */ | 1372 | */ |
1373 | rqstp->rq_usedeferral = false; | 1373 | clear_bit(RQ_USEDEFERRAL, &rqstp->rq_flags); |
1374 | 1374 | ||
1375 | /* | 1375 | /* |
1376 | * According to RFC3010, this takes precedence over all other errors. | 1376 | * According to RFC3010, this takes precedence over all other errors. |
@@ -1486,7 +1486,7 @@ encode_op: | |||
1486 | BUG_ON(cstate->replay_owner); | 1486 | BUG_ON(cstate->replay_owner); |
1487 | out: | 1487 | out: |
1488 | /* Reset deferral mechanism for RPC deferrals */ | 1488 | /* Reset deferral mechanism for RPC deferrals */ |
1489 | rqstp->rq_usedeferral = true; | 1489 | set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags); |
1490 | dprintk("nfsv4 compound returned %d\n", ntohl(status)); | 1490 | dprintk("nfsv4 compound returned %d\n", ntohl(status)); |
1491 | return status; | 1491 | return status; |
1492 | } | 1492 | } |