diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:18 +0000 |
| commit | 561ba47707bf63cac3d97143ab5928353d47459e (patch) | |
| tree | 1cdcdc0c6deef63e1822768e4283ce82330c7aa3 /fs/ext4/super.c | |
| parent | 0a92210a812d913cfb99cb959ec75f27473af664 (diff) | |
| parent | 6969595f011b46b49c3f1b9e0bd7da27768c1fd9 (diff) | |
Merge tag 'v3.10.33' into linux-linaro-lsk
This is the 3.10.33 stable release
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e4923b6a9e39..a7a5f7ea74db 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3592,16 +3592,22 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) for (i = 0; i < 4; i++) sbi->s_hash_seed[i] = le32_to_cpu(es->s_hash_seed[i]); sbi->s_def_hash_version = es->s_def_hash_version; - i = le32_to_cpu(es->s_flags); - if (i & EXT2_FLAGS_UNSIGNED_HASH) - sbi->s_hash_unsigned = 3; - else if ((i & EXT2_FLAGS_SIGNED_HASH) == 0) { + if (EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX)) { + i = le32_to_cpu(es->s_flags); + if (i & EXT2_FLAGS_UNSIGNED_HASH) + sbi->s_hash_unsigned = 3; + else if ((i & EXT2_FLAGS_SIGNED_HASH) == 0) { #ifdef __CHAR_UNSIGNED__ - es->s_flags |= cpu_to_le32(EXT2_FLAGS_UNSIGNED_HASH); - sbi->s_hash_unsigned = 3; + if (!(sb->s_flags & MS_RDONLY)) + es->s_flags |= + cpu_to_le32(EXT2_FLAGS_UNSIGNED_HASH); + sbi->s_hash_unsigned = 3; #else - es->s_flags |= cpu_to_le32(EXT2_FLAGS_SIGNED_HASH); + if (!(sb->s_flags & MS_RDONLY)) + es->s_flags |= + cpu_to_le32(EXT2_FLAGS_SIGNED_HASH); #endif + } } /* Handle clustersize */ |