---

yaml --- r: 327260 b: refs/heads/master c: f8f3d4d h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · a49d7eb · a49d7eb
1 parent 6b46ce7
commit a49d7eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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