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

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

xfs: make xfs_bmbt_to_iomap available outside of xfs_pnfs.c 



And ensure it works for RT subvolume files an set the block device,
both of which will be needed to be able to use the function in the
buffered write path.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 8be9f564

fs/xfs/xfs_iomap.c

+27 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include <linux/iomap.h>

#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_shared.h"
@@ -940,3 +941,29 @@ xfs_iomap_write_unwritten( 
	xfs_iunlock(ip, XFS_ILOCK_EXCL);

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

}

fs/xfs/xfs_iomap.h

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#ifndef __XFS_IOMAP_H__

#define __XFS_IOMAP_H__



struct iomap;

struct xfs_inode;

struct xfs_bmbt_irec;
@@ -29,4 +30,7 @@ int xfs_iomap_write_allocate(struct xfs_inode *, xfs_off_t, 
			struct xfs_bmbt_irec *);

int xfs_iomap_write_unwritten(struct xfs_inode *, xfs_off_t, xfs_off_t);



void xfs_bmbt_to_iomap(struct xfs_inode *, struct iomap *,

		struct xfs_bmbt_irec *);



#endif /* __XFS_IOMAP_H__*/

fs/xfs/xfs_pnfs.c

+0 −26
Original line number Diff line number Diff line
@@ -80,32 +80,6 @@ xfs_fs_get_uuid( 
	return 0;

}



static 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_DADDR(ip->i_mount, 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);

}



/*

 * Get a layout for the pNFS client.

 */