diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
| commit | cb7a97d01521797cad9f63e8478403c3e51fea49 (patch) | |
| tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /fs/ext3/ialloc.c | |
| parent | 0335cb76aa3fa913a2164bc9b669e5aef9d56fa3 (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/ext3/ialloc.c')
| -rw-r--r-- | fs/ext3/ialloc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index 5655fbcbd11f..8de6c720e510 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c | |||
| @@ -559,12 +559,8 @@ got: | |||
| 559 | ei->i_dir_start_lookup = 0; | 559 | ei->i_dir_start_lookup = 0; |
| 560 | ei->i_disksize = 0; | 560 | ei->i_disksize = 0; |
| 561 | 561 | ||
| 562 | ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL; | 562 | ei->i_flags = |
| 563 | if (S_ISLNK(mode)) | 563 | ext3_mask_flags(mode, EXT3_I(dir)->i_flags & EXT3_FL_INHERITED); |
| 564 | ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL); | ||
| 565 | /* dirsync only applies to directories */ | ||
| 566 | if (!S_ISDIR(mode)) | ||
| 567 | ei->i_flags &= ~EXT3_DIRSYNC_FL; | ||
| 568 | #ifdef EXT3_FRAGMENTS | 564 | #ifdef EXT3_FRAGMENTS |
| 569 | ei->i_faddr = 0; | 565 | ei->i_faddr = 0; |
| 570 | ei->i_frag_no = 0; | 566 | ei->i_frag_no = 0; |