From 2ce7f6028bf55cb75aefaeea11547ee5888f41bc Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 14 Nov 2008 10:39:03 +1100
Subject: [PATCH] --- yaml --- r: 120698 b: refs/heads/master c:
 26bf1946e69abf9528beda7adb4a783c439a5f7b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d9c7b71758db..34bb7177d7fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc7333deb741da8aafbda9ff905d3ff2c5e28a66
+refs/heads/master: 26bf1946e69abf9528beda7adb4a783c439a5f7b
diff --git a/trunk/fs/ubifs/budget.c b/trunk/fs/ubifs/budget.c
index 1a4973e10664..4a18f084cc42 100644
--- a/trunk/fs/ubifs/budget.c
+++ b/trunk/fs/ubifs/budget.c
@@ -363,7 +363,7 @@ long long ubifs_calc_available(const struct ubifs_info *c, int min_idx_lebs)
  */
 static int can_use_rp(struct ubifs_info *c)
 {
-	if (current->fsuid == c->rp_uid || capable(CAP_SYS_RESOURCE) ||
+	if (current_fsuid() == c->rp_uid || capable(CAP_SYS_RESOURCE) ||
 	    (c->rp_gid != 0 && in_group_p(c->rp_gid)))
 		return 1;
 	return 0;
diff --git a/trunk/fs/ubifs/dir.c b/trunk/fs/ubifs/dir.c
index 526c01ec8003..856189014a3a 100644
--- a/trunk/fs/ubifs/dir.c
+++ b/trunk/fs/ubifs/dir.c
@@ -104,13 +104,13 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir,
 	 */
 	inode->i_flags |= (S_NOCMTIME);
 
-	inode->i_uid = current->fsuid;
+	inode->i_uid = current_fsuid();
 	if (dir->i_mode & S_ISGID) {
 		inode->i_gid = dir->i_gid;
 		if (S_ISDIR(mode))
 			mode |= S_ISGID;
 	} else
-		inode->i_gid = current->fsgid;
+		inode->i_gid = current_fsgid();
 	inode->i_mode = mode;
 	inode->i_mtime = inode->i_atime = inode->i_ctime =
 			 ubifs_current_time(inode);