sunrpc: move rq_splice_ok flag into rq_flags

Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 0622d4f4a9a2..8880ec8cfd11 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1731,7 +1731,7 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
         argp->rqstp->rq_cachetype = cachethis ? RC_REPLBUFF : RC_NOCACHE;
 
         if (readcount > 1 || max_reply > PAGE_SIZE - auth_slack)
-                argp->rqstp->rq_splice_ok = false;
+                clear_bit(RQ_SPLICE_OK, &argp->rqstp->rq_flags);
 
         DECODE_TAIL;
 }
@@ -3253,10 +3253,10 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
 
         p = xdr_reserve_space(xdr, 8); /* eof flag and byte count */
         if (!p) {
-                WARN_ON_ONCE(resp->rqstp->rq_splice_ok);
+                WARN_ON_ONCE(test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags));
                 return nfserr_resource;
         }
-        if (resp->xdr.buf->page_len && resp->rqstp->rq_splice_ok) {
+        if (resp->xdr.buf->page_len && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) {
                 WARN_ON_ONCE(1);
                 return nfserr_resource;
         }
@@ -3273,7 +3273,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
                         goto err_truncate;
         }
 
-        if (file->f_op->splice_read && resp->rqstp->rq_splice_ok)
+        if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags))
                 err = nfsd4_encode_splice_read(resp, read, file, maxcount);
         else
                 err = nfsd4_encode_readv(resp, read, file, maxcount);