Eric Lee / smarc-uboot

Download as
Browse Code »

Commit d429ca0d831024b1b1845db8a5e950b44e10db04

Authored by Łukasz Majewski
Committed by Tom Rini
1 parent a1f41f1a55
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.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_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

fs:ext4:fix: Code refactoring to suppress compiler warnings 

Several fixes to suppress compiler's (eldk-5.[12].x  gcc 4.6)
warning  [-Wunused-but-set-variable]

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

Showing 3 changed files with 11 additions and 9 deletions Side-by-side Diff

fs/ext4/ext4_common.c
Diff comments   View file @ d429ca0
... ... @@ -378,7 +378,6 @@
378 378 struct ext_filesystem *fs = get_fs();
379 379 /* directory entry */
380 380 struct ext2_dirent *dir;
381   - char *ptr = NULL;
382 381 char *temp_dir = NULL;
383 382  
384 383 zero_buffer = zalloc(fs->blksz);
... ... @@ -415,7 +414,6 @@
415 414 if (ext4fs_log_journal(root_first_block_buffer, first_block_no_of_root))
416 415 goto fail;
417 416 dir = (struct ext2_dirent *)root_first_block_buffer;
418   - ptr = (char *)dir;
419 417 totalbytes = 0;
420 418 while (dir->direntlen > 0) {
421 419 /*
422 420  
... ... @@ -483,14 +481,12 @@
483 481 break;
484 482  
485 483 dir = (struct ext2_dirent *)((char *)dir + templength);
486   - ptr = (char *)dir;
487 484 }
488 485  
489 486 /* make a pointer ready for creating next directory entry */
490 487 templength = dir->direntlen;
491 488 totalbytes = totalbytes + templength;
492 489 dir = (struct ext2_dirent *)((char *)dir + templength);
493   - ptr = (char *)dir;
494 490  
495 491 /* get the next available inode number */
496 492 inodeno = ext4fs_get_new_inode_no();
... ... @@ -1200,6 +1196,11 @@
1200 1196 status = ext4fs_devread(di_blockno_parent *
1201 1197 fs->sect_perblk, 0,
1202 1198 fs->blksz, (char *)di_parent_buffer);
  1199 +
  1200 + if (!status) {
  1201 + printf("%s: Device read error!\n", __func__);
  1202 + goto fail;
  1203 + }
1203 1204 memset(di_parent_buffer, '\0', fs->blksz);
1204 1205  
1205 1206 /*
... ... @@ -1227,6 +1228,11 @@
1227 1228 fs->sect_perblk, 0,
1228 1229 fs->blksz,
1229 1230 (char *)di_child_buff);
  1231 +
  1232 + if (!status) {
  1233 + printf("%s: Device read error!\n", __func__);
  1234 + goto fail;
  1235 + }
1230 1236 memset(di_child_buff, '\0', fs->blksz);
1231 1237 /* filling of actual datablocks for each child */
1232 1238 for (j = 0; j < (fs->blksz / sizeof(int)); j++) {
fs/ext4/ext4_journal.c
Diff comments   View file @ d429ca0
... ... @@ -410,7 +410,7 @@
410 410 int transaction_state = TRANSACTION_COMPLETE;
411 411 int prev_desc_logical_no = 0;
412 412 int curr_desc_logical_no = 0;
413   - int ofs, flags, block;
  413 + int ofs, flags;
414 414 struct ext2_inode inode_journal;
415 415 struct journal_superblock_t *jsb = NULL;
416 416 struct journal_header_t *jdb = NULL;
... ... @@ -453,7 +453,6 @@
453 453  
454 454 i = be32_to_cpu(jsb->s_first);
455 455 while (1) {
456   - block = be32_to_cpu(jsb->s_first);
457 456 blknr = read_allocated_block(&inode_journal, i);
458 457 memset(temp_buff1, '\0', fs->blksz);
459 458 ext4fs_devread(blknr * fs->sect_perblk,
... ... @@ -931,7 +931,6 @@
931 931 int previous_block_number = -1;
932 932 int delayed_start = 0;
933 933 int delayed_extent = 0;
934   - int delayed_skipfirst = 0;
935 934 int delayed_next = 0;
936 935 char *delayed_buf = NULL;
937 936  
... ... @@ -964,7 +963,6 @@
964 963 previous_block_number = blknr;
965 964 delayed_start = blknr;
966 965 delayed_extent = blockend;
967   - delayed_skipfirst = skipfirst;
968 966 delayed_buf = buf;
969 967 delayed_next = blknr +
970 968 (blockend >> SECTOR_BITS);
... ... @@ -973,7 +971,6 @@
973 971 previous_block_number = blknr;
974 972 delayed_start = blknr;
975 973 delayed_extent = blockend;
976   - delayed_skipfirst = skipfirst;
977 974 delayed_buf = buf;
978 975 delayed_next = blknr +
979 976 (blockend >> SECTOR_BITS);