summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsacl.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2013-02-06 00:21:22 -0800
committerEric W. Biederman <ebiederm@xmission.com>2013-02-13 07:28:46 -0800
commit8e3028b908a048ac0b3102504b7daad7b5544846 (patch)
tree20b37b77dcfa7d10df6d372c77ec85991a898638 /fs/cifs/cifsacl.c
parent355958f2893d97375da17696d2566dd4ab7b54a8 (diff)
downloadlinux-8e3028b908a048ac0b3102504b7daad7b5544846.tar.gz
linux-8e3028b908a048ac0b3102504b7daad7b5544846.tar.bz2
linux-8e3028b908a048ac0b3102504b7daad7b5544846.zip
cifs: Pass GLOBAL_ROOT_UID and GLOBAL_ROOT_GID to keyring_alloc
keyring_alloc has been updated to take a kuid_t and kgid_t so pass GLOBAL_ROOT_UID instead of 0 for the uid and GLOBAL_ROOT_GID instead of 0 for the gid. Cc: Steve French <smfrench@gmail.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'fs/cifs/cifsacl.c')
-rw-r--r--fs/cifs/cifsacl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 2e811f45b413..aaaf5ce142b8 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -347,7 +347,8 @@ init_cifs_idmap(void)
if (!cred)
return -ENOMEM;
- keyring = keyring_alloc(".cifs_idmap", 0, 0, cred,
+ keyring = keyring_alloc(".cifs_idmap",
+ GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
(KEY_POS_ALL & ~KEY_POS_SETATTR) |
KEY_USR_VIEW | KEY_USR_READ,
KEY_ALLOC_NOT_IN_QUOTA, NULL);