From 7640d02b66be652f8a59e22bed0591f87033665d Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Mon, 14 Dec 2009 17:57:34 -0800
Subject: [PATCH] --- yaml --- r: 176223 b: refs/heads/master c:
 4b731d50ff3df6b9141a6c12b088e8eb0109e83c h: refs/heads/master i:   176221:
 04e5504bb392882dde9c540d345e66a30779723b   176219:
 f996e476edb33ddbbebbccc93062785377e90341   176215:
 6d4e31a5249a6b13fe3f568c09c52eee30efb963   176207:
 47b92dee11039599cba3c152d88a25277cb3cfae   176191:
 b7bcb6643f6ded08f9e111c469dd00010a595220 v: v3

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

diff --git a/[refs] b/[refs]
index c2f30f0fe983..ba570bc6cf2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5443040754207f9777f71c892c66e45ba56b0fc1
+refs/heads/master: 4b731d50ff3df6b9141a6c12b088e8eb0109e83c
diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c
index 9a4715a2f6bf..a6605ca921b6 100644
--- a/trunk/kernel/acct.c
+++ b/trunk/kernel/acct.c
@@ -536,7 +536,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 */
-	current_uid_gid(&ac.ac_uid, &ac.ac_gid);
+	ac.ac_uid = orig_cred->uid;
+	ac.ac_gid = orig_cred->gid;
 #if ACCT_VERSION==2
 	ac.ac_ahz = AHZ;
 #endif