From 9f99c3d9effd0f23b669f7c28a985b9d78531e83 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 14 Nov 2008 10:38:54 +1100
Subject: [PATCH] --- yaml --- r: 120685 b: refs/heads/master c:
 4ac8489a7294dcf92127825d74f2d981143e825d h: refs/heads/master i:   120683:
 ec4e3a1dfc7ac0cca7b6d8a82a8eb0801b79dbbb v: v3

---
 [refs]                     | 2 +-
 trunk/fs/hfsplus/inode.c   | 4 ++--
 trunk/fs/hfsplus/options.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7963005fadc8..2edff4611287 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94c9a5ee4cc7fb7eee2a9f9e47f7ccea6b1869ff
+refs/heads/master: 4ac8489a7294dcf92127825d74f2d981143e825d
diff --git a/trunk/fs/hfsplus/inode.c b/trunk/fs/hfsplus/inode.c
index b207f0e6fc22..f105ee9e1cc4 100644
--- a/trunk/fs/hfsplus/inode.c
+++ b/trunk/fs/hfsplus/inode.c
@@ -296,8 +296,8 @@ struct inode *hfsplus_new_inode(struct super_block *sb, int mode)
 
 	inode->i_ino = HFSPLUS_SB(sb).next_cnid++;
 	inode->i_mode = mode;
-	inode->i_uid = current->fsuid;
-	inode->i_gid = current->fsgid;
+	inode->i_uid = current_fsuid();
+	inode->i_gid = current_fsgid();
 	inode->i_nlink = 1;
 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
 	INIT_LIST_HEAD(&HFSPLUS_I(inode).open_dir_list);
diff --git a/trunk/fs/hfsplus/options.c b/trunk/fs/hfsplus/options.c
index 9699c56d323f..bab7f8d1bdfa 100644
--- a/trunk/fs/hfsplus/options.c
+++ b/trunk/fs/hfsplus/options.c
@@ -49,8 +49,8 @@ void hfsplus_fill_defaults(struct hfsplus_sb_info *opts)
 	opts->creator = HFSPLUS_DEF_CR_TYPE;
 	opts->type = HFSPLUS_DEF_CR_TYPE;
 	opts->umask = current->fs->umask;
-	opts->uid = current->uid;
-	opts->gid = current->gid;
+	opts->uid = current_uid();
+	opts->gid = current_gid();
 	opts->part = -1;
 	opts->session = -1;
 }