diff options
| author | Eric Sandeen <sandeen@sandeen.net> | 2007-02-10 02:37:16 -0500 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2007-02-10 02:37:16 -0500 |
| commit | f7c99b6fc7b3791cd24e0763cd4967d744c164a3 (patch) | |
| tree | 543581c6ebe8987ff83b6d8b3425e5c2723bbf3d /fs/xfs/xfs_vnodeops.c | |
| parent | 39058a0e12a8b2dcb8f9345ecad52dbcfc120ef7 (diff) | |
[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>
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index bda774a04b8f..718e18c142a5 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
| @@ -1381,7 +1381,7 @@ xfs_inactive_symlink_rmt( | |||
| 1381 | /* | 1381 | /* |
| 1382 | * Commit the first transaction. This logs the EFI and the inode. | 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 | goto error1; | 1385 | goto error1; |
| 1386 | /* | 1386 | /* |
| 1387 | * The transaction must have been committed, since there were | 1387 | * The transaction must have been committed, since there were |
| @@ -1790,8 +1790,7 @@ xfs_inactive( | |||
| 1790 | * Just ignore errors at this point. There is | 1790 | * Just ignore errors at this point. There is |
| 1791 | * nothing we can do except to try to keep going. | 1791 | * nothing we can do except to try to keep going. |
| 1792 | */ | 1792 | */ |
| 1793 | (void) xfs_bmap_finish(&tp, &free_list, first_block, | 1793 | (void) xfs_bmap_finish(&tp, &free_list, &committed); |
| 1794 | &committed); | ||
| 1795 | (void) xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); | 1794 | (void) xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); |
| 1796 | } | 1795 | } |
| 1797 | /* | 1796 | /* |
| @@ -2022,7 +2021,7 @@ xfs_create( | |||
| 2022 | IHOLD(ip); | 2021 | IHOLD(ip); |
| 2023 | vp = XFS_ITOV(ip); | 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 | if (error) { | 2025 | if (error) { |
| 2027 | xfs_bmap_cancel(&free_list); | 2026 | xfs_bmap_cancel(&free_list); |
| 2028 | goto abort_rele; | 2027 | goto abort_rele; |
| @@ -2507,7 +2506,7 @@ xfs_remove( | |||
| 2507 | xfs_trans_set_sync(tp); | 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 | if (error) { | 2510 | if (error) { |
| 2512 | REMOVE_DEBUG_TRACE(__LINE__); | 2511 | REMOVE_DEBUG_TRACE(__LINE__); |
| 2513 | goto error_rele; | 2512 | goto error_rele; |
| @@ -2715,7 +2714,7 @@ xfs_link( | |||
| 2715 | xfs_trans_set_sync(tp); | 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 | if (error) { | 2718 | if (error) { |
| 2720 | xfs_bmap_cancel(&free_list); | 2719 | xfs_bmap_cancel(&free_list); |
| 2721 | goto abort_return; | 2720 | goto abort_return; |
| @@ -2932,7 +2931,7 @@ xfs_mkdir( | |||
| 2932 | xfs_trans_set_sync(tp); | 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 | if (error) { | 2935 | if (error) { |
| 2937 | IRELE(cdp); | 2936 | IRELE(cdp); |
| 2938 | goto error2; | 2937 | goto error2; |
| @@ -3183,7 +3182,7 @@ xfs_rmdir( | |||
| 3183 | xfs_trans_set_sync(tp); | 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 | if (error) { | 3186 | if (error) { |
| 3188 | xfs_bmap_cancel(&free_list); | 3187 | xfs_bmap_cancel(&free_list); |
| 3189 | xfs_trans_cancel(tp, (XFS_TRANS_RELEASE_LOG_RES | | 3188 | xfs_trans_cancel(tp, (XFS_TRANS_RELEASE_LOG_RES | |
| @@ -3533,7 +3532,7 @@ xfs_symlink( | |||
| 3533 | */ | 3532 | */ |
| 3534 | IHOLD(ip); | 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 | if (error) { | 3536 | if (error) { |
| 3538 | goto error2; | 3537 | goto error2; |
| 3539 | } | 3538 | } |
| @@ -4145,7 +4144,7 @@ retry: | |||
| 4145 | /* | 4144 | /* |
| 4146 | * Complete the transaction | 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 | if (error) { | 4148 | if (error) { |
| 4150 | goto error0; | 4149 | goto error0; |
| 4151 | } | 4150 | } |
| @@ -4452,7 +4451,7 @@ xfs_free_file_space( | |||
| 4452 | /* | 4451 | /* |
| 4453 | * complete the transaction | 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 | if (error) { | 4455 | if (error) { |
| 4457 | goto error0; | 4456 | goto error0; |
| 4458 | } | 4457 | } |
