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

dax: don't pass buffer_head to copy_user_dax 



This way we can use this helper for the iomap based DAX implementation
as well.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 1aaba095

fs/dax.c

+6 −6
Original line number Diff line number Diff line
@@ -580,14 +580,13 @@ static int dax_load_hole(struct address_space *mapping, void *entry, 
	return VM_FAULT_LOCKED;

}



static int copy_user_bh(struct page *to, struct inode *inode,

		struct buffer_head *bh, unsigned long vaddr)

static int copy_user_dax(struct block_device *bdev, sector_t sector, size_t size,

		struct page *to, unsigned long vaddr)

{

	struct blk_dax_ctl dax = {

		.sector = to_sector(bh, inode),

		.size = bh->b_size,

		.sector = sector,

		.size = size,

	};

	struct block_device *bdev = bh->b_bdev;

	void *vto;



	if (dax_map_atomic(bdev, &dax) < 0)
@@ -867,7 +866,8 @@ int dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, 
	if (vmf->cow_page) {

		struct page *new_page = vmf->cow_page;

		if (buffer_written(&bh))

			error = copy_user_bh(new_page, inode, &bh, vaddr);

			error = copy_user_dax(bh.b_bdev, to_sector(&bh, inode),

					bh.b_size, new_page, vaddr);

		else

			clear_user_highpage(new_page, vaddr);

		if (error)

CRA Git | Maintained and supported by SUSTech CRA and CCSE