Commit 31a6f1a6 authored by Jan Kara's avatar Jan Kara Committed by Dan Williams
Browse files

dax: Simplify arguments of dax_insert_mapping() 



dax_insert_mapping() has lots of arguments and a lot of them is actuall
duplicated by passing vm_fault structure as well. Change the function to
take the same arguments as dax_pmd_insert_mapping().

Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d81b8a72

fs/dax.c

+16 −16
Original line number Diff line number Diff line
@@ -820,23 +820,30 @@ out: 
}

EXPORT_SYMBOL_GPL(dax_writeback_mapping_range);



static int dax_insert_mapping(struct address_space *mapping,

		struct block_device *bdev, struct dax_device *dax_dev,

		sector_t sector, size_t size, void *entry,

		struct vm_area_struct *vma, struct vm_fault *vmf)

static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)

{

	return iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);

}



static int dax_insert_mapping(struct vm_fault *vmf, struct iomap *iomap,

			      loff_t pos, void *entry)

{

	const sector_t sector = dax_iomap_sector(iomap, pos);

	struct vm_area_struct *vma = vmf->vma;

	struct address_space *mapping = vma->vm_file->f_mapping;

	unsigned long vaddr = vmf->address;

	void *ret, *kaddr;

	pgoff_t pgoff;

	int id, rc;

	pfn_t pfn;



	rc = bdev_dax_pgoff(bdev, sector, size, &pgoff);

	rc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff);

	if (rc)

		return rc;



	id = dax_read_lock();

	rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, &pfn);

	rc = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(PAGE_SIZE),

			       &kaddr, &pfn);

	if (rc < 0) {

		dax_read_unlock(id);

		return rc;
@@ -936,11 +943,6 @@ int __dax_zero_page_range(struct block_device *bdev, 
}

EXPORT_SYMBOL_GPL(__dax_zero_page_range);



static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)

{

	return iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);

}



static loff_t

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

		struct iomap *iomap)
@@ -1087,7 +1089,6 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf, 
	struct inode *inode = mapping->host;

	unsigned long vaddr = vmf->address;

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

	sector_t sector;

	struct iomap iomap = { 0 };

	unsigned flags = IOMAP_FAULT;

	int error, major = 0;
@@ -1140,9 +1141,9 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf, 
		goto error_finish_iomap;

	}



	sector = dax_iomap_sector(&iomap, pos);



	if (vmf->cow_page) {

		sector_t sector = dax_iomap_sector(&iomap, pos);



		switch (iomap.type) {

		case IOMAP_HOLE:

		case IOMAP_UNWRITTEN:
@@ -1175,8 +1176,7 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf, 
			count_memcg_event_mm(vmf->vma->vm_mm, PGMAJFAULT);

			major = VM_FAULT_MAJOR;

		}

		error = dax_insert_mapping(mapping, iomap.bdev, iomap.dax_dev,

				sector, PAGE_SIZE, entry, vmf->vma, vmf);

		error = dax_insert_mapping(vmf, &iomap, pos, entry);

		/* -EBUSY is fine, somebody else faulted on the same PTE */

		if (error == -EBUSY)

			error = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE