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

Commit 2af52842 authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong
Browse files

xfs: remove xfs_bunmapi() firstblock param 



All callers pass ->t_firstblock from the current transaction.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent a7beabea

fs/xfs/libxfs/xfs_attr_remote.c

+1 −2
Original line number Diff line number Diff line
@@ -631,8 +631,7 @@ xfs_attr_rmtval_remove( 
		xfs_defer_init(args->trans, args->trans->t_dfops,

			       &args->trans->t_firstblock);

		error = xfs_bunmapi(args->trans, args->dp, lblkno, blkcnt,

				    XFS_BMAPI_ATTRFORK, 1,

				    &args->trans->t_firstblock, &done);

				    XFS_BMAPI_ATTRFORK, 1, &done);

		if (error)

			goto out_defer_cancel;

		xfs_defer_ijoin(args->trans->t_dfops, args->dp);

fs/xfs/libxfs/xfs_bmap.c

+12 −13
Original line number Diff line number Diff line
@@ -5122,9 +5122,7 @@ __xfs_bunmapi( 
	xfs_fileoff_t		start,		/* first file offset deleted */

	xfs_filblks_t		*rlen,		/* i/o: amount remaining */

	int			flags,		/* misc flags */

	xfs_extnum_t		nexts,		/* number of extents max */

	xfs_fsblock_t		*firstblock)	/* first allocated block

						   controls a.g. for allocs */

	xfs_extnum_t		nexts)		/* number of extents max */

{

	struct xfs_btree_cur	*cur;		/* bmap btree cursor */

	struct xfs_bmbt_irec	del;		/* extent being deleted */
@@ -5198,7 +5196,7 @@ __xfs_bunmapi( 
	if (ifp->if_flags & XFS_IFBROOT) {

		ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE);

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_private.b.firstblock = *firstblock;

		cur->bc_private.b.firstblock = tp->t_firstblock;

		cur->bc_private.b.flags = 0;

	} else

		cur = NULL;
@@ -5314,7 +5312,7 @@ __xfs_bunmapi( 
			del.br_state = XFS_EXT_UNWRITTEN;

			error = xfs_bmap_add_extent_unwritten_real(tp, ip,

					whichfork, &icur, &cur, &del,

					firstblock, &logflags);

					&tp->t_firstblock, &logflags);

			if (error)

				goto error0;

			goto nodelete;
@@ -5371,7 +5369,8 @@ __xfs_bunmapi( 
				prev.br_state = XFS_EXT_UNWRITTEN;

				error = xfs_bmap_add_extent_unwritten_real(tp,

						ip, whichfork, &icur, &cur,

						&prev, firstblock, &logflags);

						&prev, &tp->t_firstblock,

						&logflags);

				if (error)

					goto error0;

				goto nodelete;
@@ -5380,7 +5379,8 @@ __xfs_bunmapi( 
				del.br_state = XFS_EXT_UNWRITTEN;

				error = xfs_bmap_add_extent_unwritten_real(tp,

						ip, whichfork, &icur, &cur,

						&del, firstblock, &logflags);

						&del, &tp->t_firstblock,

						&logflags);

				if (error)

					goto error0;

				goto nodelete;
@@ -5427,8 +5427,8 @@ __xfs_bunmapi( 
	 */

	if (xfs_bmap_needs_btree(ip, whichfork)) {

		ASSERT(cur == NULL);

		error = xfs_bmap_extents_to_btree(tp, ip, firstblock, &cur, 0,

				&tmp_logflags, whichfork);

		error = xfs_bmap_extents_to_btree(tp, ip, &tp->t_firstblock,

				&cur, 0, &tmp_logflags, whichfork);

		logflags |= tmp_logflags;

		if (error)

			goto error0;
@@ -5467,7 +5467,7 @@ __xfs_bunmapi( 
		xfs_trans_log_inode(tp, ip, logflags);

	if (cur) {

		if (!error) {

			*firstblock = cur->bc_private.b.firstblock;

			tp->t_firstblock = cur->bc_private.b.firstblock;

			cur->bc_private.b.allocated = 0;

		}

		xfs_btree_del_cursor(cur,
@@ -5485,12 +5485,11 @@ xfs_bunmapi( 
	xfs_filblks_t		len,

	int			flags,

	xfs_extnum_t		nexts,

	xfs_fsblock_t		*firstblock,

	int			*done)

{

	int			error;



	error = __xfs_bunmapi(tp, ip, bno, &len, flags, nexts, firstblock);

	error = __xfs_bunmapi(tp, ip, bno, &len, flags, nexts);

	*done = (len == 0);

	return error;

}
@@ -6148,7 +6147,7 @@ xfs_bmap_finish_one( 
		break;

	case XFS_BMAP_UNMAP:

		error = __xfs_bunmapi(tp, ip, startoff, blockcount,

				XFS_BMAPI_REMAP, 1, &tp->t_firstblock);

				XFS_BMAPI_REMAP, 1);

		break;

	default:

		ASSERT(0);

fs/xfs/libxfs/xfs_bmap.h

+2 −3
Original line number Diff line number Diff line
@@ -204,11 +204,10 @@ int xfs_bmapi_write(struct xfs_trans *tp, struct xfs_inode *ip, 
		xfs_extlen_t total, struct xfs_bmbt_irec *mval, int *nmap);

int	__xfs_bunmapi(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t bno, xfs_filblks_t *rlen, int flags,

		xfs_extnum_t nexts, xfs_fsblock_t *firstblock);

		xfs_extnum_t nexts);

int	xfs_bunmapi(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_fileoff_t bno, xfs_filblks_t len, int flags,

		xfs_extnum_t nexts, xfs_fsblock_t *firstblock,

		int *done);

		xfs_extnum_t nexts, int *done);

int	xfs_bmap_del_extent_delay(struct xfs_inode *ip, int whichfork,

		struct xfs_iext_cursor *cur, struct xfs_bmbt_irec *got,

		struct xfs_bmbt_irec *del);

fs/xfs/libxfs/xfs_da_btree.c

+1 −2
Original line number Diff line number Diff line
@@ -2392,8 +2392,7 @@ xfs_da_shrink_inode( 
		 * the last block to the place we want to kill.

		 */

		error = xfs_bunmapi(tp, dp, dead_blkno, count,

				    xfs_bmapi_aflag(w), 0, &tp->t_firstblock,

				    &done);

				    xfs_bmapi_aflag(w), 0, &done);

		if (error == -ENOSPC) {

			if (w != XFS_DATA_FORK)

				break;

fs/xfs/libxfs/xfs_dir2.c

+1 −2
Original line number Diff line number Diff line
@@ -656,8 +656,7 @@ xfs_dir2_shrink_inode( 
	da = xfs_dir2_db_to_da(args->geo, db);



	/* Unmap the fsblock(s). */

	error = xfs_bunmapi(tp, dp, da, args->geo->fsbcount, 0, 0,

			    &tp->t_firstblock, &done);

	error = xfs_bunmapi(tp, dp, da, args->geo->fsbcount, 0, 0, &done);

	if (error) {

		/*

		 * ENOSPC actually can happen if we're in a removename with no