diff options
author | J. Bruce Fields | 2012-05-15 04:06:49 +0200 |
---|---|---|
committer | J. Bruce Fields | 2012-06-01 02:29:58 +0200 |
commit | d5497fc693a446ce9100fcf4117c3f795ddfd0d2 (patch) | |
tree | 7254a8eb06629de6c9ac4b8dbe8e38c79c979af3 /include/linux/sunrpc | |
parent | nfsd4: stricter cred comparison for setclientid/exchange_id (diff) | |
download | kernel-qcow2-linux-d5497fc693a446ce9100fcf4117c3f795ddfd0d2.tar.gz kernel-qcow2-linux-d5497fc693a446ce9100fcf4117c3f795ddfd0d2.tar.xz kernel-qcow2-linux-d5497fc693a446ce9100fcf4117c3f795ddfd0d2.zip |
nfsd4: move rq_flavor into svc_cred
Move the rq_flavor into struct svc_cred, and use it in setclientid and
exchange_id comparisons as well.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'include/linux/sunrpc')
-rw-r--r-- | include/linux/sunrpc/svc.h | 1 | ||||
-rw-r--r-- | include/linux/sunrpc/svcauth.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 2b43e0214261..40e0a273faea 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -232,7 +232,6 @@ struct svc_rqst { struct svc_pool * rq_pool; /* thread pool */ struct svc_procedure * rq_procinfo; /* procedure info */ struct auth_ops * rq_authop; /* authentication flavour */ - u32 rq_flavor; /* pseudoflavor */ struct svc_cred rq_cred; /* auth info */ void * rq_xprt_ctxt; /* transport specific context ptr */ struct svc_deferred_req*rq_deferred; /* deferred request we are replaying */ diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h index 16fe477a96e0..dd74084a9799 100644 --- a/include/linux/sunrpc/svcauth.h +++ b/include/linux/sunrpc/svcauth.h @@ -21,6 +21,7 @@ struct svc_cred { uid_t cr_uid; gid_t cr_gid; struct group_info *cr_group_info; + u32 cr_flavor; /* pseudoflavor */ char *cr_principal; /* for gss */ }; |