summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfsfh.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2014-11-19 13:51:14 +0100
committerJ. Bruce Fields <bfields@redhat.com>2014-12-09 17:21:20 +0100
commit4d152e2c9a6a3e3556ce5da7782a9e2836edbe0f (patch)
tree3c3b778275aaeed90a0e81a708508e113bab606d /fs/nfsd/nfsfh.c
parentMerge tag 'nfs-for-3.19-1' into nfsd for-3.19 branch (diff)
downloadlinux-4d152e2c9a6a3e3556ce5da7782a9e2836edbe0f.tar.xz
linux-4d152e2c9a6a3e3556ce5da7782a9e2836edbe0f.zip
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>
Diffstat (limited to 'fs/nfsd/nfsfh.c')
-rw-r--r--fs/nfsd/nfsfh.c2
1 files changed, 1 insertions, 1 deletions
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)));