summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsacl.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2012-02-09 07:02:34 +0100
committerJames Morris <jmorris@namei.org>2012-02-09 07:02:34 +0100
commit9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c (patch)
tree2750d9fc94b8fb78d9982ea4a62d586e7f0a7862 /fs/cifs/cifsacl.c
parentMerge branch 'linus-master'; commit 'v3.3-rc3' into next (diff)
parentima: policy for RAMFS (diff)
downloadlinux-9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c.tar.xz
linux-9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c.zip
Merge branch 'next-queue' into next
Diffstat (limited to 'fs/cifs/cifsacl.c')
-rw-r--r--fs/cifs/cifsacl.c1
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)
/* instruct request_key() to use this special keyring as a cache for
* the results it looks up */
+ set_bit(KEY_FLAG_ROOT_CAN_CLEAR, &keyring->flags);
cred->thread_keyring = keyring;
cred->jit_keyring = KEY_REQKEY_DEFL_THREAD_KEYRING;
root_cred = cred;