diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2010-10-10 21:36:59 +0900 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-10-28 01:30:03 +0200 |
| commit | df0d6b8ff152b1a1aaae17c27a445ad025a358bd (patch) | |
| tree | 7358b556dd3adf3389548a299fd5dc67ab5211eb /fs/ext3/super.c | |
| parent | 86f3cbec4a193c04d0a31c13132c5956731af6ff (diff) | |
| download | blackbird-obmc-linux-df0d6b8ff152b1a1aaae17c27a445ad025a358bd.tar.gz blackbird-obmc-linux-df0d6b8ff152b1a1aaae17c27a445ad025a358bd.zip | |
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>
Diffstat (limited to 'fs/ext3/super.c')
| -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, 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()); |
