|
@@ -3695,16 +3695,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 */
|