On Sun, Aug 21, 2016 at 11:51:10PM +0200, Christoph Hellwig wrote:
> We'll need it earlier in the file soon, so the unchanged function to the
> top of xfs_iomap.c
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_iomap.c | 52 ++++++++++++++++++++++++++--------------------------
> 1 file changed, 26 insertions(+), 26 deletions(-)
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 2af0dda..ba3592f 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -44,6 +44,32 @@
> << mp->m_writeio_log)
> #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
> xfs_iomap_eof_align_last_fsb(
> xfs_mount_t *mp,
> @@ -947,32 +973,6 @@ error_on_bmapi_transaction:
> 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)
> {
> return !nimaps ||
> --
> 2.1.4
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
|