From 3f7179d963df44e41a8926ae999d1f2bc0663926 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 9 Oct 2012 15:11:55 -0700
Subject: [PATCH] --- yaml --- r: 334263 b: refs/heads/master c:
 ea1fd7776e7ed41ee4ddcff32104db5c7b372309 h: refs/heads/master i:   334261:
 f855fd7cf21e93638dbc68e2515f21a09f08d2be   334259:
 c7147686069031b4e043b2a4dd188d8ee75550c7   334255:
 fc4cb0a8dff99a9beb729166dd6e6e4ef29e2b81 v: v3

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

diff --git a/[refs] b/[refs]
index 7296426dc8ef..da4a976a1027 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bbb3095a5912be4b9c90397ef2182a5a328865b
+refs/heads/master: ea1fd7776e7ed41ee4ddcff32104db5c7b372309
diff --git a/trunk/fs/xattr_acl.c b/trunk/fs/xattr_acl.c
index 11efd830b5f5..9fbea87fdb6e 100644
--- a/trunk/fs/xattr_acl.c
+++ b/trunk/fs/xattr_acl.c
@@ -45,7 +45,7 @@ static void posix_acl_fix_xattr_userns(
 			break;
 		case ACL_GROUP:
 			gid = make_kgid(from, le32_to_cpu(entry->e_id));
-			entry->e_id = cpu_to_le32(from_kuid(to, uid));
+			entry->e_id = cpu_to_le32(from_kgid(to, gid));
 			break;
 		default:
 			break;