diff options
author | Namhyung Kim <namhyung@gmail.com> | 2010-10-10 08:36:59 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-10-27 19:30:03 -0400 |
commit | df0d6b8ff152b1a1aaae17c27a445ad025a358bd (patch) | |
tree | 7358b556dd3adf3389548a299fd5dc67ab5211eb | |
parent | 86f3cbec4a193c04d0a31c13132c5956731af6ff (diff) |
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 <namhyung@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r-- | fs/ext3/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 3ef272488ac9..daf34b1c4fb5 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -1306,9 +1306,9 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es, | |||
1306 | ext3_msg(sb, KERN_WARNING, | 1306 | ext3_msg(sb, KERN_WARNING, |
1307 | "warning: mounting fs with errors, " | 1307 | "warning: mounting fs with errors, " |
1308 | "running e2fsck is recommended"); | 1308 | "running e2fsck is recommended"); |
1309 | else if ((__s16) le16_to_cpu(es->s_max_mnt_count) >= 0 && | 1309 | else if ((__s16) le16_to_cpu(es->s_max_mnt_count) > 0 && |
1310 | le16_to_cpu(es->s_mnt_count) >= | 1310 | le16_to_cpu(es->s_mnt_count) >= |
1311 | (unsigned short) (__s16) le16_to_cpu(es->s_max_mnt_count)) | 1311 | le16_to_cpu(es->s_max_mnt_count)) |
1312 | ext3_msg(sb, KERN_WARNING, | 1312 | ext3_msg(sb, KERN_WARNING, |
1313 | "warning: maximal mount count reached, " | 1313 | "warning: maximal mount count reached, " |
1314 | "running e2fsck is recommended"); | 1314 | "running e2fsck is recommended"); |
@@ -1325,7 +1325,7 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es, | |||
1325 | valid forever! :) */ | 1325 | valid forever! :) */ |
1326 | es->s_state &= cpu_to_le16(~EXT3_VALID_FS); | 1326 | es->s_state &= cpu_to_le16(~EXT3_VALID_FS); |
1327 | #endif | 1327 | #endif |
1328 | if (!(__s16) le16_to_cpu(es->s_max_mnt_count)) | 1328 | if (!le16_to_cpu(es->s_max_mnt_count)) |
1329 | es->s_max_mnt_count = cpu_to_le16(EXT3_DFL_MAX_MNT_COUNT); | 1329 | es->s_max_mnt_count = cpu_to_le16(EXT3_DFL_MAX_MNT_COUNT); |
1330 | le16_add_cpu(&es->s_mnt_count, 1); | 1330 | le16_add_cpu(&es->s_mnt_count, 1); |
1331 | es->s_mtime = cpu_to_le32(get_seconds()); | 1331 | es->s_mtime = cpu_to_le32(get_seconds()); |