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

Commit 89eb1906 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

iomap: add an iomap-based bmap implementation 



This adds a simple iomap-based implementation of the legacy ->bmap
interface.  Note that we can't easily add checks for rt or reflink
files, so these will have to remain in the callers.  This interface
just needs to die..

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 57fc505d

fs/iomap.c

+34 −0
Original line number Diff line number Diff line
@@ -1307,3 +1307,37 @@ int iomap_swapfile_activate(struct swap_info_struct *sis, 
}

EXPORT_SYMBOL_GPL(iomap_swapfile_activate);

#endif /* CONFIG_SWAP */



static loff_t

iomap_bmap_actor(struct inode *inode, loff_t pos, loff_t length,

		void *data, struct iomap *iomap)

{

	sector_t *bno = data, addr;



	if (iomap->type == IOMAP_MAPPED) {

		addr = (pos - iomap->offset + iomap->addr) >> inode->i_blkbits;

		if (addr > INT_MAX)

			WARN(1, "would truncate bmap result\n");

		else

			*bno = addr;

	}

	return 0;

}



/* legacy ->bmap interface.  0 is the error return (!) */

sector_t

iomap_bmap(struct address_space *mapping, sector_t bno,

		const struct iomap_ops *ops)

{

	struct inode *inode = mapping->host;

	loff_t pos = bno >> inode->i_blkbits;

	unsigned blocksize = i_blocksize(inode);



	if (filemap_write_and_wait(mapping))

		return 0;



	bno = 0;

	iomap_apply(inode, pos, blocksize, 0, ops, &bno, iomap_bmap_actor);

	return bno;

}

EXPORT_SYMBOL_GPL(iomap_bmap);

include/linux/iomap.h

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include <linux/types.h>



struct address_space;

struct fiemap_extent_info;

struct inode;

struct iov_iter;
@@ -100,6 +101,8 @@ loff_t iomap_seek_hole(struct inode *inode, loff_t offset, 
		const struct iomap_ops *ops);

loff_t iomap_seek_data(struct inode *inode, loff_t offset,

		const struct iomap_ops *ops);

sector_t iomap_bmap(struct address_space *mapping, sector_t bno,

		const struct iomap_ops *ops);



/*

 * Flags for direct I/O ->end_io: