diff options
| author | David Howells <dhowells@redhat.com> | 2013-09-24 10:35:18 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2013-09-24 10:35:18 +0100 |
| commit | b2a4df200d570b2c33a57e1ebfa5896e4bc81b69 (patch) | |
| tree | 7fa48ae3c5ecff90d6d1f662fd91af5ddf74d56d /include/keys | |
| parent | 3cb989501c2688cacbb7dc4b0d353faf838f53a1 (diff) | |
| download | linux-stable-b2a4df200d570b2c33a57e1ebfa5896e4bc81b69.tar.gz linux-stable-b2a4df200d570b2c33a57e1ebfa5896e4bc81b69.tar.bz2 linux-stable-b2a4df200d570b2c33a57e1ebfa5896e4bc81b69.zip | |
KEYS: Expand the capacity of a keyring
Expand the capacity of a keyring to be able to hold a lot more keys by using
the previously added associative array implementation. Currently the maximum
capacity is:
(PAGE_SIZE - sizeof(header)) / sizeof(struct key *)
which, on a 64-bit system, is a little more 500. However, since this is being
used for the NFS uid mapper, we need more than that. The new implementation
gives us effectively unlimited capacity.
With some alterations, the keyutils testsuite runs successfully to completion
after this patch is applied. The alterations are because (a) keyrings that
are simply added to no longer appear ordered and (b) some of the errors have
changed a bit.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/keys')
| -rw-r--r-- | include/keys/keyring-type.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/include/keys/keyring-type.h b/include/keys/keyring-type.h index cf49159b0e3a..fca5c62340a4 100644 --- a/include/keys/keyring-type.h +++ b/include/keys/keyring-type.h @@ -1,6 +1,6 @@ /* Keyring key type * - * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved. + * Copyright (C) 2008, 2013 Red Hat, Inc. All Rights Reserved. * Written by David Howells (dhowells@redhat.com) * * This program is free software; you can redistribute it and/or @@ -13,19 +13,6 @@ #define _KEYS_KEYRING_TYPE_H #include <linux/key.h> -#include <linux/rcupdate.h> - -/* - * the keyring payload contains a list of the keys to which the keyring is - * subscribed - */ -struct keyring_list { - struct rcu_head rcu; /* RCU deletion hook */ - unsigned short maxkeys; /* max keys this list can hold */ - unsigned short nkeys; /* number of keys currently held */ - unsigned short delkey; /* key to be unlinked by RCU */ - struct key __rcu *keys[0]; -}; - +#include <linux/assoc_array.h> #endif /* _KEYS_KEYRING_TYPE_H */ |