diff options
author | David Howells <dhowells@redhat.com> | 2007-10-17 02:29:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:57 -0400 |
commit | 76181c134f87479fa13bf2548ddf2999055d34d4 (patch) | |
tree | 34694341c190e7ecdd3111ee48e4b98602ff012f /fs | |
parent | 398c95bdf2c24d7866692a40ba04425aef238cdd (diff) |
KEYS: Make request_key() and co fundamentally asynchronous
Make request_key() and co fundamentally asynchronous to make it easier for
NFS to make use of them. There are now accessor functions that do
asynchronous constructions, a wait function to wait for construction to
complete, and a completion function for the key type to indicate completion
of construction.
Note that the construction queue is now gone. Instead, keys under
construction are linked in to the appropriate keyring in advance, and that
anyone encountering one must wait for it to be complete before they can use
it. This is done automatically for userspace.
The following auxiliary changes are also made:
(1) Key type implementation stuff is split from linux/key.h into
linux/key-type.h.
(2) AF_RXRPC provides a way to allocate null rxrpc-type keys so that AFS does
not need to call key_instantiate_and_link() directly.
(3) Adjust the debugging macros so that they're -Wformat checked even if
they are disabled, and make it so they can be enabled simply by defining
__KDEBUG to be consistent with other code of mine.
(3) Documentation.
[alan@lxorguk.ukuu.org.uk: keys: missing word in documentation]
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/afs/cell.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/afs/cell.c b/fs/afs/cell.c index ccfa89f35259..970d38f30565 100644 --- a/fs/afs/cell.c +++ b/fs/afs/cell.c | |||
@@ -33,6 +33,7 @@ static struct afs_cell *afs_cell_root; | |||
33 | static struct afs_cell *afs_cell_alloc(const char *name, char *vllist) | 33 | static struct afs_cell *afs_cell_alloc(const char *name, char *vllist) |
34 | { | 34 | { |
35 | struct afs_cell *cell; | 35 | struct afs_cell *cell; |
36 | struct key *key; | ||
36 | size_t namelen; | 37 | size_t namelen; |
37 | char keyname[4 + AFS_MAXCELLNAME + 1], *cp, *dp, *next; | 38 | char keyname[4 + AFS_MAXCELLNAME + 1], *cp, *dp, *next; |
38 | int ret; | 39 | int ret; |
@@ -89,20 +90,14 @@ static struct afs_cell *afs_cell_alloc(const char *name, char *vllist) | |||
89 | do { | 90 | do { |
90 | *dp++ = toupper(*cp); | 91 | *dp++ = toupper(*cp); |
91 | } while (*cp++); | 92 | } while (*cp++); |
92 | cell->anonymous_key = key_alloc(&key_type_rxrpc, keyname, 0, 0, current, | ||
93 | KEY_POS_SEARCH, KEY_ALLOC_NOT_IN_QUOTA); | ||
94 | if (IS_ERR(cell->anonymous_key)) { | ||
95 | _debug("no key"); | ||
96 | ret = PTR_ERR(cell->anonymous_key); | ||
97 | goto error; | ||
98 | } | ||
99 | 93 | ||
100 | ret = key_instantiate_and_link(cell->anonymous_key, NULL, 0, | 94 | key = rxrpc_get_null_key(keyname); |
101 | NULL, NULL); | 95 | if (IS_ERR(key)) { |
102 | if (ret < 0) { | 96 | _debug("no key"); |
103 | _debug("instantiate failed"); | 97 | ret = PTR_ERR(key); |
104 | goto error; | 98 | goto error; |
105 | } | 99 | } |
100 | cell->anonymous_key = key; | ||
106 | 101 | ||
107 | _debug("anon key %p{%x}", | 102 | _debug("anon key %p{%x}", |
108 | cell->anonymous_key, key_serial(cell->anonymous_key)); | 103 | cell->anonymous_key, key_serial(cell->anonymous_key)); |