diff options
| author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /fs/ext4/ialloc.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/ext4/ialloc.c')
| -rw-r--r-- | fs/ext4/ialloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 2a117e286e54..08cac9fcace2 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c | |||
| @@ -787,7 +787,7 @@ got: | |||
| 787 | spin_unlock(sb_bgl_lock(sbi, flex_group)); | 787 | spin_unlock(sb_bgl_lock(sbi, flex_group)); |
| 788 | } | 788 | } |
| 789 | 789 | ||
| 790 | inode->i_uid = current->fsuid; | 790 | inode->i_uid = current_fsuid(); |
| 791 | if (test_opt(sb, GRPID)) | 791 | if (test_opt(sb, GRPID)) |
| 792 | inode->i_gid = dir->i_gid; | 792 | inode->i_gid = dir->i_gid; |
| 793 | else if (dir->i_mode & S_ISGID) { | 793 | else if (dir->i_mode & S_ISGID) { |
| @@ -795,7 +795,7 @@ got: | |||
| 795 | if (S_ISDIR(mode)) | 795 | if (S_ISDIR(mode)) |
| 796 | mode |= S_ISGID; | 796 | mode |= S_ISGID; |
| 797 | } else | 797 | } else |
| 798 | inode->i_gid = current->fsgid; | 798 | inode->i_gid = current_fsgid(); |
| 799 | inode->i_mode = mode; | 799 | inode->i_mode = mode; |
| 800 | 800 | ||
| 801 | inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb); | 801 | inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb); |