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

Commit e9c49736 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: move xfs_bmbt_to_iomap up 



We'll need it earlier in the file soon, so the unchanged function to
the top of xfs_iomap.c

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent ea78d808

fs/xfs/xfs_iomap.c

+26 −26
Original line number Original line Diff line number Diff line
@@ -44,6 +44,32 @@ 
						<< mp->m_writeio_log)

						<< mp->m_writeio_log)

#define XFS_WRITE_IMAPS		XFS_BMAP_MAX_NMAP

#define XFS_WRITE_IMAPS		XFS_BMAP_MAX_NMAP





void

xfs_bmbt_to_iomap(

	struct xfs_inode	*ip,

	struct iomap		*iomap,

	struct xfs_bmbt_irec	*imap)

{

	struct xfs_mount	*mp = ip->i_mount;



	if (imap->br_startblock == HOLESTARTBLOCK) {

		iomap->blkno = IOMAP_NULL_BLOCK;

		iomap->type = IOMAP_HOLE;

	} else if (imap->br_startblock == DELAYSTARTBLOCK) {

		iomap->blkno = IOMAP_NULL_BLOCK;

		iomap->type = IOMAP_DELALLOC;

	} else {

		iomap->blkno = xfs_fsb_to_db(ip, imap->br_startblock);

		if (imap->br_state == XFS_EXT_UNWRITTEN)

			iomap->type = IOMAP_UNWRITTEN;

		else

			iomap->type = IOMAP_MAPPED;

	}

	iomap->offset = XFS_FSB_TO_B(mp, imap->br_startoff);

	iomap->length = XFS_FSB_TO_B(mp, imap->br_blockcount);

	iomap->bdev = xfs_find_bdev_for_inode(VFS_I(ip));

}



STATIC int

STATIC int

xfs_iomap_eof_align_last_fsb(

xfs_iomap_eof_align_last_fsb(

	xfs_mount_t	*mp,

	xfs_mount_t	*mp,
@@ -947,32 +973,6 @@ xfs_iomap_write_unwritten( 
	return error;

	return error;

}

}





void

xfs_bmbt_to_iomap(

	struct xfs_inode	*ip,

	struct iomap		*iomap,

	struct xfs_bmbt_irec	*imap)

{

	struct xfs_mount	*mp = ip->i_mount;



	if (imap->br_startblock == HOLESTARTBLOCK) {

		iomap->blkno = IOMAP_NULL_BLOCK;

		iomap->type = IOMAP_HOLE;

	} else if (imap->br_startblock == DELAYSTARTBLOCK) {

		iomap->blkno = IOMAP_NULL_BLOCK;

		iomap->type = IOMAP_DELALLOC;

	} else {

		iomap->blkno = xfs_fsb_to_db(ip, imap->br_startblock);

		if (imap->br_state == XFS_EXT_UNWRITTEN)

			iomap->type = IOMAP_UNWRITTEN;

		else

			iomap->type = IOMAP_MAPPED;

	}

	iomap->offset = XFS_FSB_TO_B(mp, imap->br_startoff);

	iomap->length = XFS_FSB_TO_B(mp, imap->br_blockcount);

	iomap->bdev = xfs_find_bdev_for_inode(VFS_I(ip));

}



static inline bool imap_needs_alloc(struct xfs_bmbt_irec *imap, int nimaps)

static inline bool imap_needs_alloc(struct xfs_bmbt_irec *imap, int nimaps)

{

{

	return !nimaps ||

	return !nimaps ||