a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[XFS] Remove unused argument to xfs_bmap_finish

Browse Source 
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>
This commit is contained in:
Eric Sandeen 2007-02-10 18:37:16 +11:00 committed by Tim Shimmin
parent 39058a0e12
commit f7c99b6fc7
9 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/quota/xfs_dquot.c
View File

@ -484,7 +484,7 @@ xfs_qm_dqalloc(
xfs_trans_bhold(tp, bp); xfs_trans_bhold(tp, bp);
if ((error = xfs_bmap_finish(tpp, &flist, firstblock, &committed))) { if ((error = xfs_bmap_finish(tpp, &flist, &committed))) {
goto error1; goto error1;
} }

18
fs/xfs/xfs_attr.c
View File

@ -349,7 +349,7 @@ xfs_attr_set_int(xfs_inode_t *dp, const char *name, int namelen,
error = xfs_attr_shortform_to_leaf(&args); error = xfs_attr_shortform_to_leaf(&args);
if (!error) { if (!error) {
error = xfs_bmap_finish(&args.trans, args.flist, error = xfs_bmap_finish(&args.trans, args.flist,
*args.firstblock, &committed); &committed);
} }
if (error) { if (error) {
ASSERT(committed); ASSERT(committed);
@ -976,7 +976,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
error = xfs_attr_leaf_to_node(args); error = xfs_attr_leaf_to_node(args);
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, args->flist, error = xfs_bmap_finish(&args->trans, args->flist,
*args->firstblock, &committed); &committed);
} }
if (error) { if (error) {
ASSERT(committed); ASSERT(committed);
@ -1077,7 +1077,6 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, error = xfs_bmap_finish(&args->trans,
args->flist, args->flist,
*args->firstblock,
&committed); &committed);
} }
if (error) { if (error) {
@ -1155,7 +1154,7 @@ xfs_attr_leaf_removename(xfs_da_args_t *args)
/* bp is gone due to xfs_da_shrink_inode */ /* bp is gone due to xfs_da_shrink_inode */
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, args->flist, error = xfs_bmap_finish(&args->trans, args->flist,
*args->firstblock, &committed); &committed);
} }
if (error) { if (error) {
ASSERT(committed); ASSERT(committed);
@ -1310,7 +1309,6 @@ restart:
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, error = xfs_bmap_finish(&args->trans,
args->flist, args->flist,
*args->firstblock,
&committed); &committed);
} }
if (error) { if (error) {
@ -1350,7 +1348,7 @@ restart:
error = xfs_da_split(state); error = xfs_da_split(state);
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, args->flist, error = xfs_bmap_finish(&args->trans, args->flist,
*args->firstblock, &committed); &committed);
} }
if (error) { if (error) {
ASSERT(committed); ASSERT(committed);
@ -1462,7 +1460,6 @@ restart:
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, error = xfs_bmap_finish(&args->trans,
args->flist, args->flist,
*args->firstblock,
&committed); &committed);
} }
if (error) { if (error) {
@ -1597,7 +1594,7 @@ xfs_attr_node_removename(xfs_da_args_t *args)
error = xfs_da_join(state); error = xfs_da_join(state);
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, args->flist, error = xfs_bmap_finish(&args->trans, args->flist,
*args->firstblock, &committed); &committed);
} }
if (error) { if (error) {
ASSERT(committed); ASSERT(committed);
@ -1649,7 +1646,6 @@ xfs_attr_node_removename(xfs_da_args_t *args)
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, error = xfs_bmap_finish(&args->trans,
args->flist, args->flist,
*args->firstblock,
&committed); &committed);
} }
if (error) { if (error) {
@ -2093,7 +2089,7 @@ xfs_attr_rmtval_set(xfs_da_args_t *args)
args->flist, NULL); args->flist, NULL);
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, args->flist, error = xfs_bmap_finish(&args->trans, args->flist,
*args->firstblock, &committed); &committed);
} }
if (error) { if (error) {
ASSERT(committed); ASSERT(committed);
@ -2249,7 +2245,7 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args)
NULL, &done); NULL, &done);
if (!error) { if (!error) {
error = xfs_bmap_finish(&args->trans, args->flist, error = xfs_bmap_finish(&args->trans, args->flist,
*args->firstblock, &committed); &committed);
} }
if (error) { if (error) {
ASSERT(committed); ASSERT(committed);

3
fs/xfs/xfs_bmap.c
View File

@ -4080,7 +4080,7 @@ xfs_bmap_add_attrfork(
} else } else
XFS_SB_UNLOCK(mp, s); XFS_SB_UNLOCK(mp, s);
} }
if ((error = xfs_bmap_finish(&tp, &flist, firstblock, &committed))) if ((error = xfs_bmap_finish(&tp, &flist, &committed)))
goto error2; goto error2;
error = xfs_trans_commit(tp, XFS_TRANS_PERM_LOG_RES, NULL); error = xfs_trans_commit(tp, XFS_TRANS_PERM_LOG_RES, NULL);
ASSERT(ip->i_df.if_ext_max == ASSERT(ip->i_df.if_ext_max ==
@ -4213,7 +4213,6 @@ int /* error */
xfs_bmap_finish( xfs_bmap_finish(
xfs_trans_t **tp, /* transaction pointer addr */ xfs_trans_t **tp, /* transaction pointer addr */
xfs_bmap_free_t *flist, /* i/o: list extents to free */ xfs_bmap_free_t *flist, /* i/o: list extents to free */
xfs_fsblock_t firstblock, /* controlled ag for allocs */
int *committed) /* xact committed or not */ int *committed) /* xact committed or not */
{ {
xfs_efd_log_item_t *efd; /* extent free data */ xfs_efd_log_item_t *efd; /* extent free data */

1
fs/xfs/xfs_bmap.h
View File

@ -202,7 +202,6 @@ int /* error */
xfs_bmap_finish( xfs_bmap_finish(
struct xfs_trans **tp, /* transaction pointer addr */ struct xfs_trans **tp, /* transaction pointer addr */
xfs_bmap_free_t *flist, /* i/o: list extents to free */ xfs_bmap_free_t *flist, /* i/o: list extents to free */
xfs_fsblock_t firstblock, /* controlled a.g. for allocs */
int *committed); /* xact committed or not */ int *committed); /* xact committed or not */
/* /*

3
fs/xfs/xfs_inode.c
View File

@ -1699,8 +1699,7 @@ xfs_itruncate_finish(
* Duplicate the transaction that has the permanent * Duplicate the transaction that has the permanent
* reservation and commit the old transaction. * reservation and commit the old transaction.
*/ */
error = xfs_bmap_finish(tp, &free_list, first_block, error = xfs_bmap_finish(tp, &free_list, &committed);
&committed);
ntp = *tp; ntp = *tp;
if (error) { if (error) {
/* /*

8
fs/xfs/xfs_iomap.c
View File

@ -542,7 +542,7 @@ xfs_iomap_write_direct(
/* /*
* Complete the transaction * Complete the transaction
*/ */
error = xfs_bmap_finish(&tp, &free_list, firstfsb, &committed); error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error) if (error)
goto error0; goto error0;
error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL);
@ -838,8 +838,7 @@ xfs_iomap_write_allocate(
if (error) if (error)
goto trans_cancel; goto trans_cancel;
error = xfs_bmap_finish(&tp, &free_list, error = xfs_bmap_finish(&tp, &free_list, &committed);
first_block, &committed);
if (error) if (error)
goto trans_cancel; goto trans_cancel;
@ -947,8 +946,7 @@ xfs_iomap_write_unwritten(
if (error) if (error)
goto error_on_bmapi_transaction; goto error_on_bmapi_transaction;
error = xfs_bmap_finish(&(tp), &(free_list), error = xfs_bmap_finish(&(tp), &(free_list), &committed);
firstfsb, &committed);
if (error) if (error)
goto error_on_bmapi_transaction; goto error_on_bmapi_transaction;

2
fs/xfs/xfs_rename.c
View File

@ -565,7 +565,7 @@ xfs_rename(
IHOLD(target_ip); IHOLD(target_ip);
IHOLD(src_ip); IHOLD(src_ip);
error = xfs_bmap_finish(&tp, &free_list, first_block, &committed); error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error) { if (error) {
xfs_bmap_cancel(&free_list); xfs_bmap_cancel(&free_list);
xfs_trans_cancel(tp, (XFS_TRANS_RELEASE_LOG_RES | xfs_trans_cancel(tp, (XFS_TRANS_RELEASE_LOG_RES |

2
fs/xfs/xfs_rtalloc.c
View File

@ -147,7 +147,7 @@ xfs_growfs_rt_alloc(
/* /*
* Free any blocks freed up in the transaction, then commit. * Free any blocks freed up in the transaction, then commit.
*/ */
error = xfs_bmap_finish(&tp, &flist, firstblock, &committed); error = xfs_bmap_finish(&tp, &flist, &committed);
if (error) if (error)
goto error_exit; goto error_exit;
xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL);

21
fs/xfs/xfs_vnodeops.c
View File

@ -1381,7 +1381,7 @@ xfs_inactive_symlink_rmt(
/* /*
* Commit the first transaction. This logs the EFI and the inode. * Commit the first transaction. This logs the EFI and the inode.
*/ */
if ((error = xfs_bmap_finish(&tp, &free_list, first_block, &committed))) if ((error = xfs_bmap_finish(&tp, &free_list, &committed)))
goto error1; goto error1;
/* /*
* The transaction must have been committed, since there were * The transaction must have been committed, since there were
@ -1790,8 +1790,7 @@ xfs_inactive(
* Just ignore errors at this point. There is * Just ignore errors at this point. There is
* nothing we can do except to try to keep going. * nothing we can do except to try to keep going.
*/ */
(void) xfs_bmap_finish(&tp, &free_list, first_block, (void) xfs_bmap_finish(&tp, &free_list, &committed);
&committed);
(void) xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL); (void) xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES, NULL);
} }
/* /*
@ -2022,7 +2021,7 @@ xfs_create(
IHOLD(ip); IHOLD(ip);
vp = XFS_ITOV(ip); vp = XFS_ITOV(ip);
error = xfs_bmap_finish(&tp, &free_list, first_block, &committed); error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error) { if (error) {
xfs_bmap_cancel(&free_list); xfs_bmap_cancel(&free_list);
goto abort_rele; goto abort_rele;
@ -2507,7 +2506,7 @@ xfs_remove(
xfs_trans_set_sync(tp); xfs_trans_set_sync(tp);
} }
error = xfs_bmap_finish(&tp, &free_list, first_block, &committed); error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error) { if (error) {
REMOVE_DEBUG_TRACE(__LINE__); REMOVE_DEBUG_TRACE(__LINE__);
goto error_rele; goto error_rele;
@ -2715,7 +2714,7 @@ xfs_link(
xfs_trans_set_sync(tp); xfs_trans_set_sync(tp);
} }
error = xfs_bmap_finish (&tp, &free_list, first_block, &committed); error = xfs_bmap_finish (&tp, &free_list, &committed);
if (error) { if (error) {
xfs_bmap_cancel(&free_list); xfs_bmap_cancel(&free_list);
goto abort_return; goto abort_return;
@ -2932,7 +2931,7 @@ xfs_mkdir(
xfs_trans_set_sync(tp); xfs_trans_set_sync(tp);
} }
error = xfs_bmap_finish(&tp, &free_list, first_block, &committed); error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error) { if (error) {
IRELE(cdp); IRELE(cdp);
goto error2; goto error2;
@ -3183,7 +3182,7 @@ xfs_rmdir(
xfs_trans_set_sync(tp); xfs_trans_set_sync(tp);
} }
error = xfs_bmap_finish (&tp, &free_list, first_block, &committed); error = xfs_bmap_finish (&tp, &free_list, &committed);
if (error) { if (error) {
xfs_bmap_cancel(&free_list); xfs_bmap_cancel(&free_list);
xfs_trans_cancel(tp, (XFS_TRANS_RELEASE_LOG_RES | xfs_trans_cancel(tp, (XFS_TRANS_RELEASE_LOG_RES |
@ -3533,7 +3532,7 @@ xfs_symlink(
*/ */
IHOLD(ip); IHOLD(ip);
error = xfs_bmap_finish(&tp, &free_list, first_block, &committed); error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error) { if (error) {
goto error2; goto error2;
} }
@ -4145,7 +4144,7 @@ retry:
/* /*
* Complete the transaction * Complete the transaction
*/ */
error = xfs_bmap_finish(&tp, &free_list, firstfsb, &committed); error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error) { if (error) {
goto error0; goto error0;
} }
@ -4452,7 +4451,7 @@ xfs_free_file_space(
/* /*
* complete the transaction * complete the transaction
*/ */
error = xfs_bmap_finish(&tp, &free_list, firstfsb, &committed); error = xfs_bmap_finish(&tp, &free_list, &committed);
if (error) { if (error) {
goto error0; goto error0;
} }