Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8acc570fabc022d41baedc0c9bf976a4b9d16d6f

Authored by Harvey Harrison
Committed by Linus Torvalds
1 parent e13601bc6a
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

reiserfs: fix more sparse warnings in do_balan.c 

fs/reiserfs/do_balan.c:1467:10: warning: symbol 'ret_val' shadows an earlier one
fs/reiserfs/do_balan.c:275:6: originally declared here
fs/reiserfs/do_balan.c:1471:23: warning: symbol 'ih' shadows an earlier one
fs/reiserfs/do_balan.c:249:67: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 7 additions and 7 deletions Side-by-side Diff

fs/reiserfs/do_balan.c
Diff comments   View file @ 8acc570
... ... @@ -1464,29 +1464,29 @@
1464 1464 } else
1465 1465 /* item falls wholly into S_new[i] */
1466 1466 {
1467   - int ret_val;
  1467 + int leaf_mi;
1468 1468 struct item_head *pasted;
1469 1469  
1470 1470 #ifdef CONFIG_REISERFS_CHECK
1471   - struct item_head *ih =
  1471 + struct item_head *ih_check =
1472 1472 B_N_PITEM_HEAD(tbS0, item_pos);
1473 1473  
1474   - if (!is_direntry_le_ih(ih)
1475   - && (pos_in_item != ih_item_len(ih)
  1474 + if (!is_direntry_le_ih(ih_check)
  1475 + && (pos_in_item != ih_item_len(ih_check)
1476 1476 || tb->insert_size[0] <= 0))
1477 1477 reiserfs_panic(tb->tb_sb,
1478 1478 "PAP-12235: balance_leaf: pos_in_item must be equal to ih_item_len");
1479 1479 #endif /* CONFIG_REISERFS_CHECK */
1480 1480  
1481   - ret_val =
  1481 + leaf_mi =
1482 1482 leaf_move_items(LEAF_FROM_S_TO_SNEW,
1483 1483 tb, snum[i],
1484 1484 sbytes[i],
1485 1485 S_new[i]);
1486 1486  
1487   - RFALSE(ret_val,
  1487 + RFALSE(leaf_mi,
1488 1488 "PAP-12240: unexpected value returned by leaf_move_items (%d)",
1489   - ret_val);
  1489 + leaf_mi);
1490 1490  
1491 1491 /* paste into item */
1492 1492 bi.tb = tb;