OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SUNRPC: Store the hashtable size in struct rpc_cred_cache 

Cleanup in preparation for allowing the user to determine the maximum hash
table size.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2010-07-31 14:29:07 -04:00
parent 5d8d9a4d9f
commit 988664a0f6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sunrpc/auth.h
View File

@ -65,6 +65,7 @@ struct rpc_cred {
#define RPC_CREDCACHE_NR (1 << RPC_CREDCACHE_HASHBITS) #define RPC_CREDCACHE_NR (1 << RPC_CREDCACHE_HASHBITS)
struct rpc_cred_cache { struct rpc_cred_cache {
struct hlist_head hashtable[RPC_CREDCACHE_NR]; struct hlist_head hashtable[RPC_CREDCACHE_NR];
unsigned int hashbits;
spinlock_t lock; spinlock_t lock;
}; };

10
net/sunrpc/auth.c
View File

@ -145,12 +145,15 @@ int
rpcauth_init_credcache(struct rpc_auth *auth) rpcauth_init_credcache(struct rpc_auth *auth)
{ {
struct rpc_cred_cache *new; struct rpc_cred_cache *new;
unsigned int hashsize;
int i; int i;
new = kmalloc(sizeof(*new), GFP_KERNEL); new = kmalloc(sizeof(*new), GFP_KERNEL);
if (!new) if (!new)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < RPC_CREDCACHE_NR; i++) new->hashbits = RPC_CREDCACHE_HASHBITS;
hashsize = 1U << new->hashbits;
for (i = 0; i < hashsize; i++)
INIT_HLIST_HEAD(&new->hashtable[i]); INIT_HLIST_HEAD(&new->hashtable[i]);
spin_lock_init(&new->lock); spin_lock_init(&new->lock);
auth->au_credcache = new; auth->au_credcache = new;
@ -183,11 +186,12 @@ rpcauth_clear_credcache(struct rpc_cred_cache *cache)
LIST_HEAD(free); LIST_HEAD(free);
struct hlist_head *head; struct hlist_head *head;
struct rpc_cred *cred; struct rpc_cred *cred;
unsigned int hashsize = 1U << cache->hashbits;
int i; int i;
spin_lock(&rpc_credcache_lock); spin_lock(&rpc_credcache_lock);
spin_lock(&cache->lock); spin_lock(&cache->lock);
for (i = 0; i < RPC_CREDCACHE_NR; i++) { for (i = 0; i < hashsize; i++) {
head = &cache->hashtable[i]; head = &cache->hashtable[i];
while (!hlist_empty(head)) { while (!hlist_empty(head)) {
cred = hlist_entry(head->first, struct rpc_cred, cr_hash); cred = hlist_entry(head->first, struct rpc_cred, cr_hash);
@ -297,7 +301,7 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred,
*entry, *new; *entry, *new;
unsigned int nr; unsigned int nr;
nr = hash_long(acred->uid, RPC_CREDCACHE_HASHBITS); nr = hash_long(acred->uid, cache->hashbits);
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(entry, pos, &cache->hashtable[nr], cr_hash) { hlist_for_each_entry_rcu(entry, pos, &cache->hashtable[nr], cr_hash) {