diff options
| author | James Morris <jmorris@namei.org> | 2012-02-09 01:02:34 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-02-09 01:02:34 -0500 |
| commit | 9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c (patch) | |
| tree | 2750d9fc94b8fb78d9982ea4a62d586e7f0a7862 /fs/cifs/cifsacl.c | |
| parent | 2eb6038c51034bf7f9335b15ce9238a028fdd2d6 (diff) | |
| parent | 4c2c392763a682354fac65b6a569adec4e4b5387 (diff) | |
Merge branch 'next-queue' into next
Diffstat (limited to 'fs/cifs/cifsacl.c')
| -rw-r--r-- | fs/cifs/cifsacl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index c1b254487388..3cc1b251ca08 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c | |||
| @@ -556,6 +556,7 @@ init_cifs_idmap(void) | |||
| 556 | 556 | ||
| 557 | /* instruct request_key() to use this special keyring as a cache for | 557 | /* instruct request_key() to use this special keyring as a cache for |
| 558 | * the results it looks up */ | 558 | * the results it looks up */ |
| 559 | set_bit(KEY_FLAG_ROOT_CAN_CLEAR, &keyring->flags); | ||
| 559 | cred->thread_keyring = keyring; | 560 | cred->thread_keyring = keyring; |
| 560 | cred->jit_keyring = KEY_REQKEY_DEFL_THREAD_KEYRING; | 561 | cred->jit_keyring = KEY_REQKEY_DEFL_THREAD_KEYRING; |
| 561 | root_cred = cred; | 562 | root_cred = cred; |