diff options
| author |   James Morris <jmorris@namei.org> | 2010-05-06 22:21:04 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 22:21:04 +1000 |
| commit | 043b4d40f53131c5f72eca2a46555fe35328a930 (patch) | |
| tree | 02a40eeb688f7ed9730e26a22f39ad7e04378de2 /security/keys/request_key.c | |
| parent | TOMOYO: Use mutex_lock_interruptible. (diff) | |
| parent | Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 (diff) | |
| download | linux-dev-043b4d40f53131c5f72eca2a46555fe35328a930.tar.xz linux-dev-043b4d40f53131c5f72eca2a46555fe35328a930.zip | |
Merge branch 'master' into next
Conflicts:
security/keys/keyring.c
Resolved conflict with whitespace fix in find_keyring_by_name()
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys/request_key.c')
| -rw-r--r-- | security/keys/request_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 1bc38587adc4..ac49c8aacbf0 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -94,7 +94,7 @@ static int call_sbin_request_key(struct key_construction *cons, } /* attach the auth key to the session keyring */ - ret = __key_link(keyring, authkey); + ret = key_link(keyring, authkey); if (ret < 0) goto error_link; |