diff options
| author | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /security/keys/keyring.c | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'security/keys/keyring.c')
| -rw-r--r-- | security/keys/keyring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index ce7c44b857d0..2fb2bc9712ae 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c | |||
| @@ -199,7 +199,7 @@ static long keyring_read(const struct key *keyring, | |||
| 199 | int loop, ret; | 199 | int loop, ret; |
| 200 | 200 | ||
| 201 | ret = 0; | 201 | ret = 0; |
| 202 | klist = rcu_dereference(keyring->payload.subscriptions); | 202 | klist = keyring->payload.subscriptions; |
| 203 | 203 | ||
| 204 | if (klist) { | 204 | if (klist) { |
| 205 | /* calculate how much data we could return */ | 205 | /* calculate how much data we could return */ |