Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7c99b6f authored by Eric Sandeen's avatar Eric Sandeen Committed by Tim Shimmin
Browse files

[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: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 39058a0e

fs/xfs/quota/xfs_dquot.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ xfs_qm_dqalloc( 


	xfs_trans_bhold(tp, bp);



	if ((error = xfs_bmap_finish(tpp, &flist, firstblock, &committed))) {

	if ((error = xfs_bmap_finish(tpp, &flist, &committed))) {

		goto error1;

	}

fs/xfs/xfs_attr.c

+7 −11
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ xfs_attr_set_int(xfs_inode_t *dp, const char *name, int namelen, 
		error = xfs_attr_shortform_to_leaf(&args);

		if (!error) {

			error = xfs_bmap_finish(&args.trans, args.flist,

						*args.firstblock, &committed);

						&committed);

		}

		if (error) {

			ASSERT(committed);
@@ -976,7 +976,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
		error = xfs_attr_leaf_to_node(args);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						*args->firstblock, &committed);

						&committed);

		}

		if (error) {

			ASSERT(committed);
@@ -1077,7 +1077,6 @@ xfs_attr_leaf_addname(xfs_da_args_t *args) 
			if (!error) {

				error = xfs_bmap_finish(&args->trans,

							args->flist,

							*args->firstblock,

							&committed);

			}

			if (error) {
@@ -1155,7 +1154,7 @@ xfs_attr_leaf_removename(xfs_da_args_t *args) 
		/* bp is gone due to xfs_da_shrink_inode */

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						*args->firstblock, &committed);

						&committed);

		}

		if (error) {

			ASSERT(committed);
@@ -1310,7 +1309,6 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
			if (!error) {

				error = xfs_bmap_finish(&args->trans,

							args->flist,

							*args->firstblock,

							&committed);

			}

			if (error) {
@@ -1350,7 +1348,7 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
		error = xfs_da_split(state);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						*args->firstblock, &committed);

						&committed);

		}

		if (error) {

			ASSERT(committed);
@@ -1462,7 +1460,6 @@ xfs_attr_node_addname(xfs_da_args_t *args) 
			if (!error) {

				error = xfs_bmap_finish(&args->trans,

							args->flist,

							*args->firstblock,

							&committed);

			}

			if (error) {
@@ -1597,7 +1594,7 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
		error = xfs_da_join(state);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						*args->firstblock, &committed);

						&committed);

		}

		if (error) {

			ASSERT(committed);
@@ -1649,7 +1646,6 @@ xfs_attr_node_removename(xfs_da_args_t *args) 
			if (!error) {

				error = xfs_bmap_finish(&args->trans,

							args->flist,

							*args->firstblock,

							&committed);

			}

			if (error) {
@@ -2093,7 +2089,7 @@ xfs_attr_rmtval_set(xfs_da_args_t *args) 
				  args->flist, NULL);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						*args->firstblock, &committed);

						&committed);

		}

		if (error) {

			ASSERT(committed);
@@ -2249,7 +2245,7 @@ xfs_attr_rmtval_remove(xfs_da_args_t *args) 
				    NULL, &done);

		if (!error) {

			error = xfs_bmap_finish(&args->trans, args->flist,

						*args->firstblock, &committed);

						&committed);

		}

		if (error) {

			ASSERT(committed);

fs/xfs/xfs_bmap.c

+1 −2
Original line number Diff line number Diff line
@@ -4080,7 +4080,7 @@ xfs_bmap_add_attrfork( 
		} else

			XFS_SB_UNLOCK(mp, s);

	}

	if ((error = xfs_bmap_finish(&tp, &flist, firstblock, &committed)))

	if ((error = xfs_bmap_finish(&tp, &flist, &committed)))

		goto error2;

	error = xfs_trans_commit(tp, XFS_TRANS_PERM_LOG_RES, NULL);

	ASSERT(ip->i_df.if_ext_max ==
@@ -4213,7 +4213,6 @@ int /* error */ 
xfs_bmap_finish(

	xfs_trans_t		**tp,		/* transaction pointer addr */

	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 */

{

	xfs_efd_log_item_t	*efd;		/* extent free data */

fs/xfs/xfs_bmap.h

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ int /* error */ 
xfs_bmap_finish(

	struct xfs_trans	**tp,		/* transaction pointer addr */

	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 */



/*

fs/xfs/xfs_inode.c

+1 −2
Original line number Diff line number Diff line
@@ -1699,8 +1699,7 @@ xfs_itruncate_finish( 
		 * Duplicate the transaction that has the permanent

		 * reservation and commit the old transaction.

		 */

		error = xfs_bmap_finish(tp, &free_list, first_block,

					&committed);

		error = xfs_bmap_finish(tp, &free_list, &committed);

		ntp = *tp;

		if (error) {

			/*