Merge branch 'master' into next

[karo-tx-linux.git] / security / keys / request_key.c

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 1bc38587adc4f3e2f74c83aaf7912d69eb66f6f1..ac49c8aacbf089d176ed795fa8ef0ee351975245 100644 (file)
--- 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;