From 38e5b1c56499179654d0c0cb01eced52b924da67 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: 120699 b: refs/heads/master c:
 7706bb39adff18a48ff98f203ffcbb00878d8589 h: refs/heads/master i:   120697:
 140fdaab9e1ecbf0f80a24768f5f7e668b7cd199   120695:
 627b3f3865175e977ca8f19963e8983341a0ecf8 v: v3

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

diff --git a/[refs] b/[refs]
index 34bb7177d7fa..4967ecb42ee6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26bf1946e69abf9528beda7adb4a783c439a5f7b
+refs/heads/master: 7706bb39adff18a48ff98f203ffcbb00878d8589
diff --git a/trunk/fs/udf/ialloc.c b/trunk/fs/udf/ialloc.c
index a4f2b3ce45b0..31fc84297ddb 100644
--- a/trunk/fs/udf/ialloc.c
+++ b/trunk/fs/udf/ialloc.c
@@ -126,13 +126,13 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
 	}
 	mutex_unlock(&sbi->s_alloc_mutex);
 	inode->i_mode = mode;
-	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();
 	}
 
 	iinfo->i_location.logicalBlockNum = block;
diff --git a/trunk/fs/udf/namei.c b/trunk/fs/udf/namei.c
index 082409cd4b8a..f84bfaa8d941 100644
--- a/trunk/fs/udf/namei.c
+++ b/trunk/fs/udf/namei.c
@@ -604,7 +604,7 @@ static int udf_mknod(struct inode *dir, struct dentry *dentry, int mode,
 		goto out;
 
 	iinfo = UDF_I(inode);
-	inode->i_uid = current->fsuid;
+	inode->i_uid = current_fsuid();
 	init_special_inode(inode, mode, rdev);
 	fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err);
 	if (!fi) {