ext3: Cleanup ext3_setup_super()
PATCH 1/1 ext3: Cleanup ext3_setup_super()
Fix mount-count check to emit warning only if s_max_mnt_count is greater than 0 according to man tune2fs(8). Also removes unnecessary casts.
Signed-off-by Namhyung Kim <[email protected]>
---
If this looks fine, I'll send the same patches for ext2 and ext4. Thanks.
fs/ext3/super.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
fs/ext3/super.c +3 -3
@@ -1306,9 +1306,9 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,ext3_msg (sb,KERN_WARNING ,"warning: mounting fs with errors, " "running e2fsck is recommended" ); - else if ((__s16) le16_to_cpu(es->s_max_mnt_count) >= 0 && + else if ((__s16) le16_to_cpu(es->s_max_mnt_count) > 0 && le16_to_cpu(es->s_mnt_count) >= - (unsigned short) (__s16) le16_to_cpu(es->s_max_mnt_count)) + le16_to_cpu(es->s_max_mnt_count))ext3_msg (sb,KERN_WARNING ,"warning: maximal mount count reached, " "running e2fsck is recommended" );
@@ -1325,7 +1325,7 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,valid forever! :) */ es->s_state &=cpu_to_le16 (~EXT3_VALID_FS );#endif -if (!(__s16 )le16_to_cpu (es->s_max_mnt_count)) +if (!le16_to_cpu (es->s_max_mnt_count)) es->s_max_mnt_count =cpu_to_le16 (EXT3_DFL_MAX_MNT_COUNT );le16_add_cpu (&es->s_mnt_count,1 ); es->s_mtime =cpu_to_le32 (get_seconds ());
Signature · 1 line
1.7.0.4
Quoted 3 lines · Namhyung Kim
Fix mount-count check to emit warning only if
s_max_mnt_countis greater than 0 according to man tune2fs(8). Also removes unnecessary casts.
Good spotting. Merged.
Honza
Quoted 38 lines
Signed-off-by Namhyung Kim <[email protected]>---
If this looks fine, I'll send the same patches for ext2 and ext4. Thanks.
fs/ext3/super.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)fs/ext3/super.c +3
-3@@ -1306,9 +1306,9 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,ext3_msg (sb,KERN_WARNING ,"warning: mounting fs with errors, " "running e2fsck is recommended" ); - else if ((__s16) le16_to_cpu(es->s_max_mnt_count) >= 0 && + else if ((__s16) le16_to_cpu(es->s_max_mnt_count) > 0 && le16_to_cpu(es->s_mnt_count) >= - (unsigned short) (__s16) le16_to_cpu(es->s_max_mnt_count)) + le16_to_cpu(es->s_max_mnt_count))ext3_msg (sb,KERN_WARNING ,"warning: maximal mount count reached, " "running e2fsck is recommended" );@@ -1325,7 +1325,7 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,valid forever! :) */ es->s_state &=cpu_to_le16 (~EXT3_VALID_FS );#endif -if (!(__s16 )le16_to_cpu (es->s_max_mnt_count)) +if (!le16_to_cpu (es->s_max_mnt_count)) es->s_max_mnt_count =cpu_to_le16 (EXT3_DFL_MAX_MNT_COUNT );le16_add_cpu (&es->s_mnt_count,1 ); es->s_mtime =cpu_to_le32 (get_seconds ());Signature · 1 line
1.7.0.4
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR