diff --git a/[refs] b/[refs]
index 7574db424c3a..3f15c2d6bf86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f025adf191924e3a75ce80e130afcd2485b53bb8
+refs/heads/master: 4e963d4f3ed1b756ff20f84960fcb4db42509146
diff --git a/trunk/fs/nfs/idmap.c b/trunk/fs/nfs/idmap.c
index bc3968fa81e5..f77017c4e28b 100644
--- a/trunk/fs/nfs/idmap.c
+++ b/trunk/fs/nfs/idmap.c
@@ -193,7 +193,8 @@ static int nfs_idmap_init_keyring(void)
 	if (!cred)
 		return -ENOMEM;
 
-	keyring = keyring_alloc(".id_resolver", 0, 0, cred,
+	keyring = keyring_alloc(".id_resolver",
+				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);