diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-06-07 10:14:14 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-07-10 23:40:31 -0400 |
| commit | 4a8c1344dccb848dbcf0edabc8b5c51a8ecf2808 (patch) | |
| tree | ecfa69d4bc36aefe86c2528240ef69da723f5bf4 /include/linux | |
| parent | c1384c9c4c184543375b52a0997d06cd98145164 (diff) | |
SUNRPC: Add a backpointer from the struct rpc_cred to the rpc_auth
Cleans up an issue whereby rpcsec_gss uses the rpc_clnt->cl_auth. If we want
to be able to add several rpc_auths to a single rpc_clnt, then this abuse
must go.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sunrpc/auth.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h index 534cdc7be58d..8ef27afeea73 100644 --- a/include/linux/sunrpc/auth.h +++ b/include/linux/sunrpc/auth.h | |||
| @@ -30,8 +30,11 @@ struct auth_cred { | |||
| 30 | /* | 30 | /* |
| 31 | * Client user credentials | 31 | * Client user credentials |
| 32 | */ | 32 | */ |
| 33 | struct rpc_auth; | ||
| 34 | struct rpc_credops; | ||
| 33 | struct rpc_cred { | 35 | struct rpc_cred { |
| 34 | struct hlist_node cr_hash; /* hash chain */ | 36 | struct hlist_node cr_hash; /* hash chain */ |
| 37 | struct rpc_auth * cr_auth; | ||
| 35 | struct rpc_credops * cr_ops; | 38 | struct rpc_credops * cr_ops; |
| 36 | unsigned long cr_expire; /* when to gc */ | 39 | unsigned long cr_expire; /* when to gc */ |
| 37 | atomic_t cr_count; /* ref count */ | 40 | atomic_t cr_count; /* ref count */ |
| @@ -60,6 +63,7 @@ struct rpc_cred_cache { | |||
| 60 | unsigned long expire; /* cache expiry interval */ | 63 | unsigned long expire; /* cache expiry interval */ |
| 61 | }; | 64 | }; |
| 62 | 65 | ||
| 66 | struct rpc_authops; | ||
| 63 | struct rpc_auth { | 67 | struct rpc_auth { |
| 64 | unsigned int au_cslack; /* call cred size estimate */ | 68 | unsigned int au_cslack; /* call cred size estimate */ |
| 65 | /* guess at number of u32's auth adds before | 69 | /* guess at number of u32's auth adds before |
