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

Commit 1b16447b authored by Dave Chinner's avatar Dave Chinner Committed by Alex Elder
Browse files

xfs: pass bmalloca structure to xfs_bmap_isaeof 



All the variables xfs_bmap_isaeof() is passed are contained within
the xfs_bmalloca structure. Pass that instead.

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 a5bd606b

fs/xfs/xfs_bmap.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -3867,22 +3867,21 @@ xfs_bmap_last_extent( 
 * blocks at the end of the file which do not start at the previous data block,

 * blocks at the end of the file which do not start at the previous data block,

 * we will try to align the new blocks at stripe unit boundaries.

 * we will try to align the new blocks at stripe unit boundaries.

 *

 *

 * Returns 0 in *aeof if the file (fork) is empty as any new write will be at,

 * Returns 0 in bma->aeof if the file (fork) is empty as any new write will be

 * or past the EOF.

 * at, or past the EOF.

 */

 */

STATIC int

STATIC int

xfs_bmap_isaeof(

xfs_bmap_isaeof(

	struct xfs_inode	*ip,

	struct xfs_bmalloca	*bma,

	xfs_fileoff_t		off,

	int			whichfork)

	int			whichfork,

	char			*aeof)

{

{

	struct xfs_bmbt_irec	rec;

	struct xfs_bmbt_irec	rec;

	int			is_empty;

	int			is_empty;

	int			error;

	int			error;





	*aeof = 0;

	bma->aeof = 0;

	error = xfs_bmap_last_extent(NULL, ip, whichfork, &rec, &is_empty);

	error = xfs_bmap_last_extent(NULL, bma->ip, whichfork, &rec,

				     &is_empty);

	if (error || is_empty)

	if (error || is_empty)

		return error;

		return error;
@@ -3890,8 +3889,9 @@ xfs_bmap_isaeof( 
	 * Check if we are allocation or past the last extent, or at least into

	 * Check if we are allocation or past the last extent, or at least into

	 * the last delayed allocated extent.

	 * the last delayed allocated extent.

	 */

	 */

	*aeof = off >= rec.br_startoff + rec.br_blockcount ||

	bma->aeof = bma->off >= rec.br_startoff + rec.br_blockcount ||

		(off >= rec.br_startoff && isnullstartblock(rec.br_startblock));

		(bma->off >= rec.br_startoff &&

		 isnullstartblock(rec.br_startblock));

	return 0;

	return 0;

}

}
@@ -4658,7 +4658,7 @@ xfs_bmapi_allocate( 
	 */

	 */

	if (mp->m_dalign && alen >= mp->m_dalign &&

	if (mp->m_dalign && alen >= mp->m_dalign &&

	    !(flags & XFS_BMAPI_METADATA) && whichfork == XFS_DATA_FORK) {

	    !(flags & XFS_BMAPI_METADATA) && whichfork == XFS_DATA_FORK) {

		error = xfs_bmap_isaeof(bma->ip, aoff, whichfork, &bma->aeof);

		error = xfs_bmap_isaeof(bma, whichfork);

		if (error)

		if (error)

			return error;

			return error;

	}

	}