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

Commit 5b777ad5 authored by Dave Chinner's avatar Dave Chinner Committed by Alex Elder
Browse files

xfs: remove xfs_bmapi_single() 



Now we have xfs_bmapi_read, there is no need for xfs_bmapi_single().
Change the remaining caller over and kill the function.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 5c8ed202

fs/xfs/xfs_bmap.c

+0 −52
Original line number Diff line number Diff line
@@ -4968,58 +4968,6 @@ xfs_bmapi( 
	return error;

}



/*

 * Map file blocks to filesystem blocks, simple version.

 * One block (extent) only, read-only.

 * For flags, only the XFS_BMAPI_ATTRFORK flag is examined.

 * For the other flag values, the effect is as if XFS_BMAPI_METADATA

 * was set and all the others were clear.

 */

int						/* error */

xfs_bmapi_single(

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_inode_t	*ip,		/* incore inode */

	int		whichfork,	/* data or attr fork */

	xfs_fsblock_t	*fsb,		/* output: mapped block */

	xfs_fileoff_t	bno)		/* starting file offs. mapped */

{

	int		eof;		/* we've hit the end of extents */

	int		error;		/* error return */

	xfs_bmbt_irec_t	got;		/* current file extent record */

	xfs_ifork_t	*ifp;		/* inode fork pointer */

	xfs_extnum_t	lastx;		/* last useful extent number */

	xfs_bmbt_irec_t	prev;		/* previous file extent record */



	ifp = XFS_IFORK_PTR(ip, whichfork);

	if (unlikely(

	    XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE &&

	    XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS)) {

	       XFS_ERROR_REPORT("xfs_bmapi_single", XFS_ERRLEVEL_LOW,

				ip->i_mount);

	       return XFS_ERROR(EFSCORRUPTED);

	}

	if (XFS_FORCED_SHUTDOWN(ip->i_mount))

		return XFS_ERROR(EIO);

	XFS_STATS_INC(xs_blk_mapr);

	if (!(ifp->if_flags & XFS_IFEXTENTS) &&

	    (error = xfs_iread_extents(tp, ip, whichfork)))

		return error;

	(void)xfs_bmap_search_extents(ip, bno, whichfork, &eof, &lastx, &got,

		&prev);

	/*

	 * Reading past eof, act as though there's a hole

	 * up to end.

	 */

	if (eof || got.br_startoff > bno) {

		*fsb = NULLFSBLOCK;

		return 0;

	}

	ASSERT(!isnullstartblock(got.br_startblock));

	ASSERT(bno < got.br_startoff + got.br_blockcount);

	*fsb = got.br_startblock + (bno - got.br_startoff);

	return 0;

}



/*

 * Unmap (remove) blocks from a file.

 * If nexts is nonzero then the number of extents to remove is limited to

fs/xfs/xfs_bmap.h

+0 −15
Original line number Diff line number Diff line
@@ -298,21 +298,6 @@ int xfs_bmapi_read(struct xfs_inode *ip, xfs_fileoff_t bno, 
		xfs_filblks_t len, struct xfs_bmbt_irec *mval,

		int *nmap, int flags);



/*

 * Map file blocks to filesystem blocks, simple version.

 * One block only, read-only.

 * For flags, only the XFS_BMAPI_ATTRFORK flag is examined.

 * For the other flag values, the effect is as if XFS_BMAPI_METADATA

 * was set and all the others were clear.

 */

int						/* error */

xfs_bmapi_single(

	struct xfs_trans	*tp,		/* transaction pointer */

	struct xfs_inode	*ip,		/* incore inode */

	int			whichfork,	/* data or attr fork */

	xfs_fsblock_t		*fsb,		/* output: mapped block */

	xfs_fileoff_t		bno);		/* starting file offs. mapped */



/*

 * Unmap (remove) blocks from a file.

 * If nexts is nonzero then the number of extents to remove is limited to

fs/xfs/xfs_da_btree.c

+8 −24
Original line number Diff line number Diff line
@@ -1975,32 +1975,16 @@ xfs_da_do_buf( 
		/*

		 * Optimize the one-block case.

		 */

		if (nfsb == 1) {

			xfs_fsblock_t	fsb;



			if ((error =

			    xfs_bmapi_single(trans, dp, whichfork, &fsb,

				    (xfs_fileoff_t)bno))) {

				return error;

			}

		if (nfsb == 1)

			mapp = &map;

			if (fsb == NULLFSBLOCK) {

				nmap = 0;

			} else {

				map.br_startblock = fsb;

				map.br_startoff = (xfs_fileoff_t)bno;

				map.br_blockcount = 1;

				nmap = 1;

			}

		} else {

		else

			mapp = kmem_alloc(sizeof(*mapp) * nfsb, KM_SLEEP);



		nmap = nfsb;

			error = xfs_bmapi_read(dp, (xfs_fileoff_t)bno, nfsb,

					       mapp, &nmap,

					       xfs_bmapi_aflag(whichfork));

		error = xfs_bmapi_read(dp, (xfs_fileoff_t)bno, nfsb, mapp,

				       &nmap, xfs_bmapi_aflag(whichfork));

		if (error)

			goto exit0;

		}

	} else {

		map.br_startblock = XFS_DADDR_TO_FSB(mp, mappedbno);

		map.br_startoff = (xfs_fileoff_t)bno;

fs/xfs/xfs_rtalloc.c

+11 −21
Original line number Diff line number Diff line
@@ -856,33 +856,23 @@ xfs_rtbuf_get( 
	xfs_buf_t	**bpp)		/* output: buffer for the block */

{

	xfs_buf_t	*bp;		/* block buffer, result */

	xfs_daddr_t	d;		/* disk addr of block */

	int		error;		/* error value */

	xfs_fsblock_t	fsb;		/* fs block number for block */

	xfs_inode_t	*ip;		/* bitmap or summary inode */

	xfs_bmbt_irec_t	map;

	int		nmap;

	int		error;		/* error value */



	ip = issum ? mp->m_rsumip : mp->m_rbmip;

	/*

	 * Map from the file offset (block) and inode number to the

	 * file system block.

	 */

	error = xfs_bmapi_single(tp, ip, XFS_DATA_FORK, &fsb, block);

	if (error) {



	error = xfs_bmapi_read(ip, block, 1, &map, &nmap, XFS_DATA_FORK);

	if (error)

		return error;

	}

	ASSERT(fsb != NULLFSBLOCK);

	/*

	 * Convert to disk address for buffer cache.

	 */

	d = XFS_FSB_TO_DADDR(mp, fsb);

	/*

	 * Read the buffer.

	 */

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d,



	ASSERT(map.br_startblock != NULLFSBLOCK);

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,

				   XFS_FSB_TO_DADDR(mp, map.br_startblock),

				   mp->m_bsize, 0, &bp);

	if (error) {

	if (error)

		return error;

	}

	ASSERT(!xfs_buf_geterror(bp));

	*bpp = bp;

	return 0;