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

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

xfs: remove xfs_bmapi_write() 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 d0a9d795

fs/xfs/libxfs/xfs_attr_remote.c

+1 −2
Original line number Diff line number Diff line
@@ -484,8 +484,7 @@ xfs_attr_rmtval_set( 
			       &args->trans->t_firstblock);

		nmap = 1;

		error = xfs_bmapi_write(args->trans, dp, (xfs_fileoff_t)lblkno,

				  blkcnt, XFS_BMAPI_ATTRFORK,

				  &args->trans->t_firstblock, args->total, &map,

				  blkcnt, XFS_BMAPI_ATTRFORK, args->total, &map,

				  &nmap);

		if (error)

			goto out_defer_cancel;

fs/xfs/libxfs/xfs_bmap.c

+5 −13
Original line number Diff line number Diff line
@@ -4212,12 +4212,6 @@ xfs_bmapi_convert_unwritten( 
 * extent state if necessary.  Details behaviour is controlled by the flags

 * parameter.  Only allocates blocks from a single allocation group, to avoid

 * locking problems.

 *

 * The returned value in "firstblock" from the first call in a transaction

 * must be remembered and presented to subsequent calls in "firstblock".

 * An upper bound for the number of blocks to be allocated is supplied to

 * the first call in "total"; if no allocation group has that many free

 * blocks then the call will fail (return NULLFSBLOCK in "firstblock").

 */

int

xfs_bmapi_write(
@@ -4226,8 +4220,6 @@ xfs_bmapi_write( 
	xfs_fileoff_t		bno,		/* starting file offs. mapped */

	xfs_filblks_t		len,		/* length to map in file */

	int			flags,		/* XFS_BMAPI_... */

	xfs_fsblock_t		*firstblock,	/* first allocated block

						   controls a.g. for allocs */

	xfs_extlen_t		total,		/* total blocks needed */

	struct xfs_bmbt_irec	*mval,		/* output: map values */

	int			*nmap)		/* i/o: mval size/count */
@@ -4294,7 +4286,7 @@ xfs_bmapi_write( 


	XFS_STATS_INC(mp, xs_blk_mapw);



	if (!tp || *firstblock == NULLFSBLOCK) {

	if (!tp || tp->t_firstblock == NULLFSBLOCK) {

		if (XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE)

			bma.minleft = be16_to_cpu(ifp->if_broot->bb_level) + 1;

		else
@@ -4321,7 +4313,7 @@ xfs_bmapi_write( 
	bma.ip = ip;

	bma.total = total;

	bma.datatype = 0;

	bma.firstblock = firstblock;

	bma.firstblock = &tp->t_firstblock;

	ASSERT(!tp || tp->t_dfops);



	while (bno < end && n < *nmap) {
@@ -4474,11 +4466,11 @@ xfs_bmapi_write( 


	if (bma.cur) {

		if (!error) {

			ASSERT(*firstblock == NULLFSBLOCK ||

			       XFS_FSB_TO_AGNO(mp, *firstblock) <=

			ASSERT(tp->t_firstblock == NULLFSBLOCK ||

			       XFS_FSB_TO_AGNO(mp, tp->t_firstblock) <=

			       XFS_FSB_TO_AGNO(mp,

				       bma.cur->bc_private.b.firstblock));

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

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

		}

		xfs_btree_del_cursor(bma.cur,

			error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR);

fs/xfs/libxfs/xfs_bmap.h

+1 −2
Original line number Diff line number Diff line
@@ -201,8 +201,7 @@ int xfs_bmapi_read(struct xfs_inode *ip, xfs_fileoff_t bno, 
		int *nmap, int flags);

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

		xfs_fileoff_t bno, xfs_filblks_t len, int flags,

		xfs_fsblock_t *firstblock, xfs_extlen_t total,

		struct xfs_bmbt_irec *mval, int *nmap);

		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);

fs/xfs/libxfs/xfs_da_btree.c

+2 −3
Original line number Diff line number Diff line
@@ -2061,7 +2061,7 @@ xfs_da_grow_inode_int( 
	nmap = 1;

	error = xfs_bmapi_write(tp, dp, *bno, count,

			xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA|XFS_BMAPI_CONTIG,

			&tp->t_firstblock, args->total, &map, &nmap);

			args->total, &map, &nmap);

	if (error)

		return error;
@@ -2083,8 +2083,7 @@ xfs_da_grow_inode_int( 
			c = (int)(*bno + count - b);

			error = xfs_bmapi_write(tp, dp, b, c,

					xfs_bmapi_aflag(w)|XFS_BMAPI_METADATA,

					&tp->t_firstblock, args->total,

					&mapp[mapi], &nmap);

					args->total, &mapp[mapi], &nmap);

			if (error)

				goto out_free_map;

			if (nmap < 1)

fs/xfs/xfs_bmap_util.c

+2 −3
Original line number Diff line number Diff line
@@ -973,9 +973,8 @@ xfs_alloc_file_space( 


		xfs_defer_init(tp, &dfops, &tp->t_firstblock);

		error = xfs_bmapi_write(tp, ip, startoffset_fsb,

					allocatesize_fsb, alloc_type,

					&tp->t_firstblock, resblks, imapp,

					&nimaps);

					allocatesize_fsb, alloc_type, resblks,

					imapp, &nimaps);

		if (error)

			goto error0;