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>

1 files changed, 4 insertions, 1 deletions

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 5c71ccb9659d..eaa9263c2d28 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -797,7 +797,10 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
 
         clear_bit(XPT_OLD, &xprt->xpt_flags);
 
-        rqstp->rq_secure = xprt->xpt_ops->xpo_secure_port(rqstp);
+        if (xprt->xpt_ops->xpo_secure_port(rqstp))
+                set_bit(RQ_SECURE, &rqstp->rq_flags);
+        else
+                clear_bit(RQ_SECURE, &rqstp->rq_flags);
         rqstp->rq_chandle.defer = svc_defer;
         rqstp->rq_xid = svc_getu32(&rqstp->rq_arg.head[0]);