From a49d7eb5bb4df06b679328388c2b1625804f99eb Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 7 Feb 2012 16:54:50 -0800
Subject: [PATCH] --- yaml --- r: 327260 b: refs/heads/master c:
 f8f3d4de2d04e1a5b4293b67faee8ebabc64e9fa h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/init/Kconfig  | 1 -
 trunk/kernel/acct.c | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d0b90faaeff0..c22b4e9f6894 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bd6e32acec66c55c6c1af4672f3216b2ac88e35
+refs/heads/master: f8f3d4de2d04e1a5b4293b67faee8ebabc64e9fa
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index f0f636cf0ce7..6de46ef12e3f 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -931,7 +931,6 @@ config UIDGID_CONVERTED
 	depends on FS_POSIX_ACL = n
 	depends on QUOTA = n
 	depends on QUOTACTL = n
-	depends on BSD_PROCESS_ACCT = n
 
 	# Networking
 	depends on NET_9P = n
diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c
index 02e6167a53b0..6cd7529c9e6a 100644
--- a/trunk/kernel/acct.c
+++ b/trunk/kernel/acct.c
@@ -507,8 +507,8 @@ static void do_acct_process(struct bsd_acct_struct *acct,
 	do_div(elapsed, AHZ);
 	ac.ac_btime = get_seconds() - elapsed;
 	/* we really need to bite the bullet and change layout */
-	ac.ac_uid = orig_cred->uid;
-	ac.ac_gid = orig_cred->gid;
+	ac.ac_uid = from_kuid_munged(file->f_cred->user_ns, orig_cred->uid);
+	ac.ac_gid = from_kgid_munged(file->f_cred->user_ns, orig_cred->gid);
 #if ACCT_VERSION==2
 	ac.ac_ahz = AHZ;
 #endif