Commit 96dcb97d authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'for-5.14/dax' into libnvdimm-fixes 

Pick up some small dax cleanups that make some of Ira's follow on work
easier.
parents f21453b0 b05d4c57

drivers/dax/super.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, 
		return -ENXIO;



	if (nr_pages < 0)

		return nr_pages;

		return -EINVAL;



	avail = dax_dev->ops->direct_access(dax_dev, pgoff, nr_pages,

			kaddr, pfn);

fs/dax.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static int copy_cow_page_dax(struct block_device *bdev, struct dax_device *dax_d 
		return rc;



	id = dax_read_lock();

	rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(PAGE_SIZE), &kaddr, NULL);

	rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL);

	if (rc < 0) {

		dax_read_unlock(id);

		return rc;

fs/fuse/dax.c

+2 −4
Original line number Diff line number Diff line
@@ -1235,8 +1235,6 @@ void fuse_dax_conn_free(struct fuse_conn *fc) 
static int fuse_dax_mem_range_init(struct fuse_conn_dax *fcd)

{

	long nr_pages, nr_ranges;

	void *kaddr;

	pfn_t pfn;

	struct fuse_dax_mapping *range;

	int ret, id;

	size_t dax_size = -1;
@@ -1248,8 +1246,8 @@ static int fuse_dax_mem_range_init(struct fuse_conn_dax *fcd) 
	INIT_DELAYED_WORK(&fcd->free_work, fuse_dax_free_mem_worker);



	id = dax_read_lock();

	nr_pages = dax_direct_access(fcd->dev, 0, PHYS_PFN(dax_size), &kaddr,

				     &pfn);

	nr_pages = dax_direct_access(fcd->dev, 0, PHYS_PFN(dax_size), NULL,

				     NULL);

	dax_read_unlock(id);

	if (nr_pages < 0) {

		pr_debug("dax_direct_access() returned %ld\n", nr_pages);