diff options
author | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-11-15 15:10:36 -0800 |
commit | 4327974639c4d7f8688f564081956f8f79ef053c (patch) | |
tree | 0ca57c56b2f76a39f476e8f22b0112aa566b3a86 /fs/ext4/ext4.h | |
parent | c3e5127312f97482a6a09c0df602c726675eff5b (diff) | |
parent | f6b252b6b92671d2633008408c06d35c26e55ecf (diff) |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Diffstat (limited to 'fs/ext4/ext4.h')
-rw-r--r-- | fs/ext4/ext4.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index b7d7bd0f066..5c38120c389 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -358,8 +358,7 @@ struct flex_groups { /* Flags that should be inherited by new inodes from their parent. */ #define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\ - EXT4_SYNC_FL | EXT4_IMMUTABLE_FL | EXT4_APPEND_FL |\ - EXT4_NODUMP_FL | EXT4_NOATIME_FL |\ + EXT4_SYNC_FL | EXT4_NODUMP_FL | EXT4_NOATIME_FL |\ EXT4_NOCOMPR_FL | EXT4_JOURNAL_DATA_FL |\ EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL) |