From 627b3f3865175e977ca8f19963e8983341a0ecf8 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 14 Nov 2008 10:39:01 +1100
Subject: [PATCH] --- yaml --- r: 120695 b: refs/heads/master c:
 414cb209eaca52b708debc014a8085b7fbb15f14 h: refs/heads/master i:   120693:
 01c86bc9206331b7475f1b32177f707f74da33fd   120691:
 75f53bff47fcd662e4a770aa85878a7b4b8abdb6   120687:
 5767ff59351954745ff802c3fe4d71094820e87c v: v3

---
 [refs]                    | 2 +-
 trunk/fs/reiserfs/namei.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1acdbbf480e4..bc1a5cec553f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0785f4dad0f7173f3b7133e3c274fe130e8fdbc6
+refs/heads/master: 414cb209eaca52b708debc014a8085b7fbb15f14
diff --git a/trunk/fs/reiserfs/namei.c b/trunk/fs/reiserfs/namei.c
index f89ebb943f3f..4f322e5ed840 100644
--- a/trunk/fs/reiserfs/namei.c
+++ b/trunk/fs/reiserfs/namei.c
@@ -573,7 +573,7 @@ static int new_inode_init(struct inode *inode, struct inode *dir, int mode)
 	/* the quota init calls have to know who to charge the quota to, so
 	 ** we have to set uid and gid here
 	 */
-	inode->i_uid = current->fsuid;
+	inode->i_uid = current_fsuid();
 	inode->i_mode = mode;
 	/* Make inode invalid - just in case we are going to drop it before
 	 * the initialization happens */
@@ -584,7 +584,7 @@ static int new_inode_init(struct inode *inode, struct inode *dir, int mode)
 		if (S_ISDIR(mode))
 			inode->i_mode |= S_ISGID;
 	} else {
-		inode->i_gid = current->fsgid;
+		inode->i_gid = current_fsgid();
 	}
 	DQUOT_INIT(inode);
 	return 0;