diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
| commit | 0a8c5395f90f06d128247844b2515c8bf3f2826b (patch) | |
| tree | d95382dcdfa303b99d480c01763d6cb6767fdaca /fs/ext3/ialloc.c | |
| parent | 25051158bbed127e8672b43396c71c5eb610e5f1 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
[XFS] Fix merge failures
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/ext3/ialloc.c')
| -rw-r--r-- | fs/ext3/ialloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index 47b678d73e7a..490bd0ed7896 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c | |||
| @@ -539,7 +539,7 @@ got: | |||
| 539 | percpu_counter_inc(&sbi->s_dirs_counter); | 539 | percpu_counter_inc(&sbi->s_dirs_counter); |
| 540 | sb->s_dirt = 1; | 540 | sb->s_dirt = 1; |
| 541 | 541 | ||
| 542 | inode->i_uid = current->fsuid; | 542 | inode->i_uid = current_fsuid(); |
| 543 | if (test_opt (sb, GRPID)) | 543 | if (test_opt (sb, GRPID)) |
| 544 | inode->i_gid = dir->i_gid; | 544 | inode->i_gid = dir->i_gid; |
| 545 | else if (dir->i_mode & S_ISGID) { | 545 | else if (dir->i_mode & S_ISGID) { |
| @@ -547,7 +547,7 @@ got: | |||
| 547 | if (S_ISDIR(mode)) | 547 | if (S_ISDIR(mode)) |
| 548 | mode |= S_ISGID; | 548 | mode |= S_ISGID; |
| 549 | } else | 549 | } else |
| 550 | inode->i_gid = current->fsgid; | 550 | inode->i_gid = current_fsgid(); |
| 551 | inode->i_mode = mode; | 551 | inode->i_mode = mode; |
| 552 | 552 | ||
| 553 | inode->i_ino = ino; | 553 | inode->i_ino = ino; |