sunrpc: add a generic rq_flags field to svc_rqst and move rq_secure to it

In a later patch, we're going to need some atomic bit flags. Since that
field will need to be an unsigned long, we mitigate that space
consumption by migrating some other bitflags to the new field. Start
with the rq_secure flag.

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

2 files changed, 3 insertions, 3 deletions

diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index 122f69185ef5..83a9694ec485 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -490,7 +490,7 @@ found_entry:
         /* From the hall of fame of impractical attacks:
          * Is this a user who tries to snoop on the cache? */
         rtn = RC_DOIT;
-        if (!rqstp->rq_secure && rp->c_secure)
+        if (!test_bit(RQ_SECURE, &rqstp->rq_flags) && rp->c_secure)
                 goto out;
 
         /* Compose RPC reply header */
@@ -579,7 +579,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
         spin_lock(&b->cache_lock);
         drc_mem_usage += bufsize;
         lru_put_end(b, rp);
-        rp->c_secure = rqstp->rq_secure;
+        rp->c_secure = test_bit(RQ_SECURE, &rqstp->rq_flags);
         rp->c_type = cachetype;
         rp->c_state = RC_DONE;
         spin_unlock(&b->cache_lock);
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 88026fc6a981..965b478d50fc 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -86,7 +86,7 @@ static __be32 nfsd_setuser_and_check_port(struct svc_rqst *rqstp,
         int flags = nfsexp_flags(rqstp, exp);
 
         /* Check if the request originated from a secure port. */
-        if (!rqstp->rq_secure && !(flags & NFSEXP_INSECURE_PORT)) {
+        if (!test_bit(RQ_SECURE, &rqstp->rq_flags) && !(flags & NFSEXP_INSECURE_PORT)) {
                 RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
                 dprintk("nfsd: request from insecure port %s!\n",
                         svc_print_addr(rqstp, buf, sizeof(buf)));