diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-04-29 03:36:24 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-29 03:36:24 -0400 |
| commit | 7407cf355fdf5500430be966dbbde84a27293bad (patch) | |
| tree | 922861288ff38558ed721a79653f52b17b13bb95 /security/keys/keyring.c | |
| parent | 6a47dc1418682c83d603b491df1d048f73aa973e (diff) | |
| parent | 79dba2eaa771c3173957eccfd288e0e0d12e4d3f (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
fs/block_dev.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
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 e814d2109f8e..dd7cd0f8e13c 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c | |||
| @@ -201,7 +201,7 @@ static long keyring_read(const struct key *keyring, | |||
| 201 | int loop, ret; | 201 | int loop, ret; |
| 202 | 202 | ||
| 203 | ret = 0; | 203 | ret = 0; |
| 204 | klist = rcu_dereference(keyring->payload.subscriptions); | 204 | klist = keyring->payload.subscriptions; |
| 205 | 205 | ||
| 206 | if (klist) { | 206 | if (klist) { |
| 207 | /* calculate how much data we could return */ | 207 | /* calculate how much data we could return */ |