Commit f21bdbba authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

Merge branch 'iomap-for-next' into mb/dio

parents 0d0a60c9 a9010042

fs/dax.c

+8 −5
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ EXPORT_SYMBOL_GPL(__dax_zero_page_range); 


static loff_t

dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,

		struct iomap *iomap)

		struct iomap *iomap, struct iomap *srcmap)

{

	struct block_device *bdev = iomap->bdev;

	struct dax_device *dax_dev = iomap->dax_dev;
@@ -1247,7 +1247,8 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp, 
	struct inode *inode = mapping->host;

	unsigned long vaddr = vmf->address;

	loff_t pos = (loff_t)vmf->pgoff << PAGE_SHIFT;

	struct iomap iomap = { 0 };

	struct iomap iomap = { .type = IOMAP_HOLE };

	struct iomap srcmap = { .type = IOMAP_HOLE };

	unsigned flags = IOMAP_FAULT;

	int error, major = 0;

	bool write = vmf->flags & FAULT_FLAG_WRITE;
@@ -1292,7 +1293,7 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp, 
	 * the file system block size to be equal the page size, which means

	 * that we never have to deal with more than a single extent here.

	 */

	error = ops->iomap_begin(inode, pos, PAGE_SIZE, flags, &iomap);

	error = ops->iomap_begin(inode, pos, PAGE_SIZE, flags, &iomap, &srcmap);

	if (iomap_errp)

		*iomap_errp = error;

	if (error) {
@@ -1471,7 +1472,8 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp, 
	unsigned int iomap_flags = (write ? IOMAP_WRITE : 0) | IOMAP_FAULT;

	struct inode *inode = mapping->host;

	vm_fault_t result = VM_FAULT_FALLBACK;

	struct iomap iomap = { 0 };

	struct iomap iomap = { .type = IOMAP_HOLE };

	struct iomap srcmap = { .type = IOMAP_HOLE };

	pgoff_t max_pgoff;

	void *entry;

	loff_t pos;
@@ -1546,7 +1548,8 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fault *vmf, pfn_t *pfnp, 
	 * to look up our filesystem block.

	 */

	pos = (loff_t)xas.xa_index << PAGE_SHIFT;

	error = ops->iomap_begin(inode, pos, PMD_SIZE, iomap_flags, &iomap);

	error = ops->iomap_begin(inode, pos, PMD_SIZE, iomap_flags, &iomap,

			&srcmap);

	if (error)

		goto unlock_entry;

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ int ext2_get_block(struct inode *inode, sector_t iblock, 


#ifdef CONFIG_FS_DAX

static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,

		unsigned flags, struct iomap *iomap)

		unsigned flags, struct iomap *iomap, struct iomap *srcmap)

{

	unsigned int blkbits = inode->i_blkbits;

	unsigned long first_block = offset >> blkbits;

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3449,7 +3449,7 @@ static bool ext4_inode_datasync_dirty(struct inode *inode) 
}



static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,

			    unsigned flags, struct iomap *iomap)

		unsigned flags, struct iomap *iomap, struct iomap *srcmap)

{

	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

	unsigned int blkbits = inode->i_blkbits;

fs/gfs2/bmap.c

+2 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,8 @@ static inline bool gfs2_iomap_need_write_lock(unsigned flags) 
}



static int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length,

			    unsigned flags, struct iomap *iomap)

			    unsigned flags, struct iomap *iomap,

			    struct iomap *srcmap)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct metapath mp = { .mp_aheight = 1, };

fs/gfs2/file.c

+4 −2
Original line number Diff line number Diff line
@@ -732,7 +732,8 @@ static ssize_t gfs2_file_direct_read(struct kiocb *iocb, struct iov_iter *to) 
	if (ret)

		goto out_uninit;



	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL);

	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL,

			   is_sync_kiocb(iocb));



	gfs2_glock_dq(&gh);

out_uninit:
@@ -767,7 +768,8 @@ static ssize_t gfs2_file_direct_write(struct kiocb *iocb, struct iov_iter *from) 
	if (offset + len > i_size_read(&ip->i_inode))

		goto out;



	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL);

	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL,

			   is_sync_kiocb(iocb));



out:

	gfs2_glock_dq(&gh);