[XFS] Fix merge failures

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/linux-2.6/xfs_cred.h
	fs/xfs/linux-2.6/xfs_globals.h
	fs/xfs/linux-2.6/xfs_ioctl.c
	fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/kernel/acct.c b/kernel/acct.c
index f6006a60df5d..d57b7cbb98b6 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -530,15 +530,14 @@ 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 = current->uid;
-        ac.ac_gid = current->gid;
+        current_uid_gid(&ac.ac_uid, &ac.ac_gid);
 #if ACCT_VERSION==2
         ac.ac_ahz = AHZ;
 #endif
 #if ACCT_VERSION==1 || ACCT_VERSION==2
         /* backward-compatible 16 bit fields */
-        ac.ac_uid16 = current->uid;
-        ac.ac_gid16 = current->gid;
+        ac.ac_uid16 = ac.ac_uid;
+        ac.ac_gid16 = ac.ac_gid;
 #endif
 #if ACCT_VERSION==3
         ac.ac_pid = task_tgid_nr_ns(current, ns);