fs/ext3/super.c: fix sparse warnings

PATCH In review [email protected] 1 participant 2 messages Mar 19, 2005 – Mar 20, 2005 VFS

lore

Share & tools

lore

[email protected]

author

2005-03-19 13:18 UTC #0 lore raw

PATCH 3/6 fs/ext3/super.c: fix sparse warnings

Signed-off-by Domen Puncer <[email protected]>

---

 kj-domen/fs/ext3/super.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

fs/ext3/super.c renamed from fs/ext3/super.c~sparse-fs_ext3_super +3 -2

diff -puN fs/ext3/super.c~sparse-fs_ext3_super fs/ext3/super.c
@@ -2106,6 +2106,7 @@ static int ext3_remount (struct super_bl
 			ext3_mark_recovery_complete(sb, es);
 		} else {
 			__le32 ret;
+			int ret1;
 			if ((ret = EXT3_HAS_RO_COMPAT_FEATURE(sb,
 					~EXT3_FEATURE_RO_COMPAT_SUPP))) {
 				printk(KERN_WARNING "EXT3-fs: %s: couldn't "

@@ -2122,8 +2123,8 @@ static int ext3_remount (struct super_bl
 			 */
 			ext3_clear_journal_err(sb, es);
 			sbi->s_mount_state = le16_to_cpu(es->s_state);
-			if ((ret = ext3_group_extend(sb, es, n_blocks_count)))
-				return ret;
+			if ((ret1 = ext3_group_extend(sb, es, n_blocks_count)))
+				return ret1;
 			if (!ext3_setup_super (sb, es, 0))
 				sb->s_flags &= ~MS_RDONLY;
 		}

Domen Puncer

author

2005-03-20 11:54 UTC #1 lore raw

Signed-off-by Alexey Dobriyan <[email protected]>

Signed-off-by Domen Puncer <[email protected]>

---

 kj-domen/fs/ext3/super.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

fs/ext3/super.c renamed from fs/ext3/super.c~sparse-fs_ext3_super +3 -2

diff -puN fs/ext3/super.c~sparse-fs_ext3_super fs/ext3/super.c
@@ -2106,6 +2106,7 @@ static int ext3_remount (struct super_bl
 			ext3_mark_recovery_complete(sb, es);
 		} else {
 			__le32 ret;
+			int ret1;
 			if ((ret = EXT3_HAS_RO_COMPAT_FEATURE(sb,
 					~EXT3_FEATURE_RO_COMPAT_SUPP))) {
 				printk(KERN_WARNING "EXT3-fs: %s: couldn't "

@@ -2122,8 +2123,8 @@ static int ext3_remount (struct super_bl
 			 */
 			ext3_clear_journal_err(sb, es);
 			sbi->s_mount_state = le16_to_cpu(es->s_state);
-			if ((ret = ext3_group_extend(sb, es, n_blocks_count)))
-				return ret;
+			if ((ret1 = ext3_group_extend(sb, es, n_blocks_count)))
+				return ret1;
 			if (!ext3_setup_super (sb, es, 0))
 				sb->s_flags &= ~MS_RDONLY;
 		}