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/ext2/ialloc.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/ext2/ialloc.c')
| -rw-r--r-- | fs/ext2/ialloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index f59741346760..8d0add625870 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c | |||
| @@ -550,7 +550,7 @@ got: | |||
| 550 | 550 | ||
| 551 | sb->s_dirt = 1; | 551 | sb->s_dirt = 1; |
| 552 | mark_buffer_dirty(bh2); | 552 | mark_buffer_dirty(bh2); |
| 553 | inode->i_uid = current->fsuid; | 553 | inode->i_uid = current_fsuid(); |
| 554 | if (test_opt (sb, GRPID)) | 554 | if (test_opt (sb, GRPID)) |
| 555 | inode->i_gid = dir->i_gid; | 555 | inode->i_gid = dir->i_gid; |
| 556 | else if (dir->i_mode & S_ISGID) { | 556 | else if (dir->i_mode & S_ISGID) { |
| @@ -558,7 +558,7 @@ got: | |||
| 558 | if (S_ISDIR(mode)) | 558 | if (S_ISDIR(mode)) |
| 559 | mode |= S_ISGID; | 559 | mode |= S_ISGID; |
| 560 | } else | 560 | } else |
| 561 | inode->i_gid = current->fsgid; | 561 | inode->i_gid = current_fsgid(); |
| 562 | inode->i_mode = mode; | 562 | inode->i_mode = mode; |
| 563 | 563 | ||
| 564 | inode->i_ino = ino; | 564 | inode->i_ino = ino; |