diff options
| author | Ingo Molnar <[email protected]> | 2009-01-11 02:41:39 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2009-01-11 02:41:39 +0000 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /fs/ext2/ialloc.c | |
| parent | rcu: fix bug in rcutorture system-shutdown code (diff) | |
| parent | Linux 2.6.29-rc1 (diff) | |
| download | kernel-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.gz kernel-abede81c4fb2e3b85d8760f25e3da39d2c69a134.zip | |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'fs/ext2/ialloc.c')
| -rw-r--r-- | fs/ext2/ialloc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index c454d5db28a5..66321a877e74 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c @@ -565,12 +565,8 @@ got: inode->i_blocks = 0; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; memset(ei->i_data, 0, sizeof(ei->i_data)); - ei->i_flags = EXT2_I(dir)->i_flags & ~EXT2_BTREE_FL; - if (S_ISLNK(mode)) - ei->i_flags &= ~(EXT2_IMMUTABLE_FL|EXT2_APPEND_FL); - /* dirsync is only applied to directories */ - if (!S_ISDIR(mode)) - ei->i_flags &= ~EXT2_DIRSYNC_FL; + ei->i_flags = + ext2_mask_flags(mode, EXT2_I(dir)->i_flags & EXT2_FL_INHERITED); ei->i_faddr = 0; ei->i_frag_no = 0; ei->i_frag_size = 0; |