Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f7c99b6fc7b3791cd24e0763cd4967d744c164a3

Authored by Eric Sandeen
Committed by Tim Shimmin
1 parent 39058a0e12
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

[XFS] Remove unused argument to xfs_bmap_finish 

The firstblock argument to xfs_bmap_finish is not used by that function.
Remove it and cleanup the code a bit.

Patch provided by Eric Sandeen.

SGI-PV: 960196
SGI-Modid: xfs-linux-melb:xfs-kern:28034a

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

Showing 9 changed files with 25 additions and 35 deletions Side-by-side Diff

fs/xfs/quota/xfs_dquot.c
Diff comments   View file @ f7c99b6
... ... @@ -484,7 +484,7 @@
484 484  
485 485 xfs_trans_bhold(tp, bp);
486 486  
487   - if ((error = xfs_bmap_finish(tpp, &flist, firstblock, &committed))) {
  487 + if ((error = xfs_bmap_finish(tpp, &flist, &committed))) {
488 488 goto error1;
489 489 }
490 490  
... ... @@ -349,7 +349,7 @@
349 349 error = xfs_attr_shortform_to_leaf(&args);
350 350 if (!error) {
351 351 error = xfs_bmap_finish(&args.trans, args.flist,
352   - *args.firstblock, &committed);
  352 + &committed);
353 353 }
354 354 if (error) {
355 355 ASSERT(committed);
... ... @@ -976,7 +976,7 @@
976 976 error = xfs_attr_leaf_to_node(args);
977 977 if (!error) {
978 978 error = xfs_bmap_finish(&args->trans, args->flist,
979   - *args->firstblock, &committed);
  979 + &committed);
980 980 }
981 981 if (error) {
982 982 ASSERT(committed);
... ... @@ -1077,7 +1077,6 @@
1077 1077 if (!error) {
1078 1078 error = xfs_bmap_finish(&args->trans,
1079 1079 args->flist,
1080   - *args->firstblock,
1081 1080 &committed);
1082 1081 }
1083 1082 if (error) {
... ... @@ -1155,7 +1154,7 @@
1155 1154 /* bp is gone due to xfs_da_shrink_inode */
1156 1155 if (!error) {
1157 1156 error = xfs_bmap_finish(&args->trans, args->flist,
1158   - *args->firstblock, &committed);
  1157 + &committed);
1159 1158 }
1160 1159 if (error) {
1161 1160 ASSERT(committed);
... ... @@ -1310,7 +1309,6 @@
1310 1309 if (!error) {
1311 1310 error = xfs_bmap_finish(&args->trans,
1312 1311 args->flist,
1313   - *args->firstblock,
1314 1312 &committed);
1315 1313 }
1316 1314 if (error) {
... ... @@ -1350,7 +1348,7 @@
1350 1348 error = xfs_da_split(state);
1351 1349 if (!error) {
1352 1350 error = xfs_bmap_finish(&args->trans, args->flist,
1353   - *args->firstblock, &committed);
  1351 + &committed);
1354 1352 }
1355 1353 if (error) {
1356 1354 ASSERT(committed);
... ... @@ -1462,7 +1460,6 @@
1462 1460 if (!error) {
1463 1461 error = xfs_bmap_finish(&args->trans,
1464 1462 args->flist,
1465   - *args->firstblock,
1466 1463 &committed);
1467 1464 }
1468 1465 if (error) {
... ... @@ -1597,7 +1594,7 @@
1597 1594 error = xfs_da_join(state);
1598 1595 if (!error) {
1599 1596 error = xfs_bmap_finish(&args->trans, args->flist,
1600   - *args->firstblock, &committed);
  1597 + &committed);
1601 1598 }
1602 1599 if (error) {
1603 1600 ASSERT(committed);
... ... @@ -1649,7 +1646,6 @@
1649 1646 if (!error) {
1650 1647 error = xfs_bmap_finish(&args->trans,
1651 1648 args->flist,
1652   - *args->firstblock,
1653 1649 &committed);
1654 1650 }
1655 1651 if (error) {
... ... @@ -2093,7 +2089,7 @@
2093 2089 args->flist, NULL);
2094 2090 if (!error) {
2095 2091 error = xfs_bmap_finish(&args->trans, args->flist,
2096   - *args->firstblock, &committed);
  2092 + &committed);
2097 2093 }
2098 2094 if (error) {
2099 2095 ASSERT(committed);
... ... @@ -2249,7 +2245,7 @@
2249 2245 NULL, &done);
2250 2246 if (!error) {
2251 2247 error = xfs_bmap_finish(&args->trans, args->flist,
2252   - *args->firstblock, &committed);
  2248 + &committed);
2253 2249 }
2254 2250 if (error) {
2255 2251 ASSERT(committed);
... ... @@ -4080,7 +4080,7 @@
4080 4080 } else
4081 4081 XFS_SB_UNLOCK(mp, s);
4082 4082 }
4083   - if ((error = xfs_bmap_finish(&tp, &flist, firstblock, &committed)))
  4083 + if ((error = xfs_bmap_finish(&tp, &flist, &committed)))
4084 4084 goto error2;
4085 4085 error = xfs_trans_commit(tp, XFS_TRANS_PERM_LOG_RES, NULL);
4086 4086 ASSERT(ip->i_df.if_ext_max ==
... ... @@ -4213,7 +4213,6 @@
4213 4213 xfs_bmap_finish(
4214 4214 xfs_trans_t **tp, /* transaction pointer addr */
4215 4215 xfs_bmap_free_t *flist, /* i/o: list extents to free */
4216   - xfs_fsblock_t firstblock, /* controlled ag for allocs */
4217 4216 int *committed) /* xact committed or not */
4218 4217 {
4219 4218 xfs_efd_log_item_t *efd; /* extent free data */
... ... @@ -202,7 +202,6 @@
202 202 xfs_bmap_finish(
203 203 struct xfs_trans **tp, /* transaction pointer addr */
204 204 xfs_bmap_free_t *flist, /* i/o: list extents to free */
205   - xfs_fsblock_t firstblock, /* controlled a.g. for allocs */
206 205 int *committed); /* xact committed or not */
207 206  
208 207 /*
... ... @@ -1699,8 +1699,7 @@
1699 1699 * Duplicate the transaction that has the permanent
1700 1700 * reservation and commit the old transaction.
1701 1701 */
1702   - error = xfs_bmap_finish(tp, &free_list, first_block,
1703   - &committed);
  1702 + error = xfs_bmap_finish(tp, &free_list, &committed);
1704 1703 ntp = *tp;
1705 1704 if (error) {
1706 1705 /*
... ... @@ -542,7 +542,7 @@
542 542 /*
543 543 * Complete the transaction
544 544 */
545   - error = xfs_bmap_finish(&tp, &free_list, firstfsb, &committed);
  545 + error = xfs_bmap_finish(&tp, &free_list, &committed);
546 546 if (error)
547 547 goto error0;
548 548 error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL);
... ... @@ -838,8 +838,7 @@
838 838 if (error)
839 839 goto trans_cancel;
840 840  
841   - error = xfs_bmap_finish(&tp, &free_list,
842   - first_block, &committed);
  841 + error = xfs_bmap_finish(&tp, &free_list, &committed);
843 842 if (error)
844 843 goto trans_cancel;
845 844  
... ... @@ -947,8 +946,7 @@
947 946 if (error)
948 947 goto error_on_bmapi_transaction;
949 948  
950   - error = xfs_bmap_finish(&(tp), &(free_list),
951   - firstfsb, &committed);
  949 + error = xfs_bmap_finish(&(tp), &(free_list), &committed);
952 950 if (error)
953 951 goto error_on_bmapi_transaction;
954 952  
... ... @@ -565,7 +565,7 @@
565 565 IHOLD(target_ip);
566 566 IHOLD(src_ip);
567 567  
568   - error = xfs_bmap_finish(&tp, &free_list, first_block, &committed);
  568 + error = xfs_bmap_finish(&tp, &free_list, &committed);
569 569 if (error) {
570 570 xfs_bmap_cancel(&free_list);
571 571 xfs_trans_cancel(tp, (XFS_TRANS_RELEASE_LOG_RES |
fs/xfs/xfs_rtalloc.c
Diff comments   View file @ f7c99b6
... ... @@ -147,7 +147,7 @@
147 147 /*
148 148 * Free any blocks freed up in the transaction, then commit.
149 149 */
150   - error = xfs_bmap_finish(&tp, &flist, firstblock, &committed);
  150 + error = xfs_bmap_finish(&tp, &flist, &committed);
151 151 if (error)
152 152 goto error_exit;
153 153 xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL);
fs/xfs/xfs_vnodeops.c
Diff comments   View file @ f7c99b6
... ... @@ -1381,7 +1381,7 @@
1381 1381 /*
1382 1382 * Commit the first transaction. This logs the EFI and the inode.
1383 1383 */
1384   - if ((error = xfs_bmap_finish(&tp, &free_list, first_block, &committed)))
  1384 + if ((error = xfs_bmap_finish(&tp, &free_list, &committed)))
1385 1385 goto error1;
1386 1386 /*
1387 1387 * The transaction must have been committed, since there were
... ... @@ -1790,8 +1790,7 @@
1790 1790 * Just ignore errors at this point. There is
1791 1791 * nothing we can do except to try to keep going.
1792 1792 */
1793   - (void) xfs_bmap_finish(&tp, &free_list, first_block,
1794   - &committed);
  1793 + (void) xfs_bmap_finish(&tp, &free_list, &committed);
1795 1794 (void) xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL);
1796 1795 }
1797 1796 /*
... ... @@ -2022,7 +2021,7 @@
2022 2021 IHOLD(ip);
2023 2022 vp = XFS_ITOV(ip);
2024 2023  
2025   - error = xfs_bmap_finish(&tp, &free_list, first_block, &committed);
  2024 + error = xfs_bmap_finish(&tp, &free_list, &committed);
2026 2025 if (error) {
2027 2026 xfs_bmap_cancel(&free_list);
2028 2027 goto abort_rele;
... ... @@ -2507,7 +2506,7 @@
2507 2506 xfs_trans_set_sync(tp);
2508 2507 }
2509 2508  
2510   - error = xfs_bmap_finish(&tp, &free_list, first_block, &committed);
  2509 + error = xfs_bmap_finish(&tp, &free_list, &committed);
2511 2510 if (error) {
2512 2511 REMOVE_DEBUG_TRACE(__LINE__);
2513 2512 goto error_rele;
... ... @@ -2715,7 +2714,7 @@
2715 2714 xfs_trans_set_sync(tp);
2716 2715 }
2717 2716  
2718   - error = xfs_bmap_finish (&tp, &free_list, first_block, &committed);
  2717 + error = xfs_bmap_finish (&tp, &free_list, &committed);
2719 2718 if (error) {
2720 2719 xfs_bmap_cancel(&free_list);
2721 2720 goto abort_return;
... ... @@ -2932,7 +2931,7 @@
2932 2931 xfs_trans_set_sync(tp);
2933 2932 }
2934 2933  
2935   - error = xfs_bmap_finish(&tp, &free_list, first_block, &committed);
  2934 + error = xfs_bmap_finish(&tp, &free_list, &committed);
2936 2935 if (error) {
2937 2936 IRELE(cdp);
2938 2937 goto error2;
... ... @@ -3183,7 +3182,7 @@
3183 3182 xfs_trans_set_sync(tp);
3184 3183 }
3185 3184  
3186   - error = xfs_bmap_finish (&tp, &free_list, first_block, &committed);
  3185 + error = xfs_bmap_finish (&tp, &free_list, &committed);
3187 3186 if (error) {
3188 3187 xfs_bmap_cancel(&free_list);
3189 3188 xfs_trans_cancel(tp, (XFS_TRANS_RELEASE_LOG_RES |
... ... @@ -3533,7 +3532,7 @@
3533 3532 */
3534 3533 IHOLD(ip);
3535 3534  
3536   - error = xfs_bmap_finish(&tp, &free_list, first_block, &committed);
  3535 + error = xfs_bmap_finish(&tp, &free_list, &committed);
3537 3536 if (error) {
3538 3537 goto error2;
3539 3538 }
... ... @@ -4145,7 +4144,7 @@
4145 4144 /*
4146 4145 * Complete the transaction
4147 4146 */
4148   - error = xfs_bmap_finish(&tp, &free_list, firstfsb, &committed);
  4147 + error = xfs_bmap_finish(&tp, &free_list, &committed);
4149 4148 if (error) {
4150 4149 goto error0;
4151 4150 }
... ... @@ -4452,7 +4451,7 @@
4452 4451 /*
4453 4452 * complete the transaction
4454 4453 */
4455   - error = xfs_bmap_finish(&tp, &free_list, firstfsb, &committed);
  4454 + error = xfs_bmap_finish(&tp, &free_list, &committed);
4456 4455 if (error) {
4457 4456 goto error0;
4458 4457 }