Merge branch 'next' into for-linus

[linux-2.6-omap-h63xx.git] / fs / omfs / inode.c

diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index cbf047a847c5e3d6c3558d16cce217b475e9163c..633e9dc972bbc63edb052e89cd924aad8e25e8c3 100644 (file)
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -37,9 +37,8 @@ struct inode *omfs_new_inode(struct inode *dir, int mode)
 
        inode->i_ino = new_block;
        inode->i_mode = mode;
-       inode->i_uid = current->fsuid;
-       inode->i_gid = current->fsgid;
-       inode->i_blocks = 0;
+       inode->i_uid = current_fsuid();
+       inode->i_gid = current_fsgid();
        inode->i_mapping->a_ops = &omfs_aops;
 
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
@@ -420,8 +419,8 @@ static int omfs_fill_super(struct super_block *sb, void *data, int silent)
 
        sb->s_fs_info = sbi;
 
-       sbi->s_uid = current->uid;
-       sbi->s_gid = current->gid;
+       sbi->s_uid = current_uid();
+       sbi->s_gid = current_gid();
        sbi->s_dmask = sbi->s_fmask = current->fs->umask;
 
        if (!parse_options((char *) data, sbi))