From 49434535124f3a53f6b37226fe4ac11f9840f006 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 6 Feb 2013 00:21:22 -0800
Subject: [PATCH] --- yaml --- r: 357835 b: refs/heads/master c:
 8e3028b908a048ac0b3102504b7daad7b5544846 h: refs/heads/master i:   357833:
 b644ffcbdcb160f3edd5d61023c592a3f966ca99   357831:
 a34b83cc0f4b2bd99d4f4c3f088bb86aa746433f v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/cifsacl.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7c303f549d7d..b2eed82b797a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 355958f2893d97375da17696d2566dd4ab7b54a8
+refs/heads/master: 8e3028b908a048ac0b3102504b7daad7b5544846
diff --git a/trunk/fs/cifs/cifsacl.c b/trunk/fs/cifs/cifsacl.c
index 2e811f45b413..aaaf5ce142b8 100644
--- a/trunk/fs/cifs/cifsacl.c
+++ b/trunk/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);