Commit 39b6389a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dan Williams
Browse files

dax: stop using bdevname 



Just use the %pg format specifier instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Link: https://lore.kernel.org/r/20210826135510.6293-3-hch@lst.de


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 6c97ec17

drivers/dax/super.c

+7 −13
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev, 
{

	bool dax_enabled = false;

	pgoff_t pgoff, pgoff_end;

	char buf[BDEVNAME_SIZE];

	void *kaddr, *end_kaddr;

	pfn_t pfn, end_pfn;

	sector_t last_page;
@@ -81,29 +80,25 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev, 
	int err, id;



	if (blocksize != PAGE_SIZE) {

		pr_info("%s: error: unsupported blocksize for dax\n",

				bdevname(bdev, buf));

		pr_info("%pg: error: unsupported blocksize for dax\n", bdev);

		return false;

	}



	if (!dax_dev) {

		pr_debug("%s: error: dax unsupported by block device\n",

				bdevname(bdev, buf));

		pr_debug("%pg: error: dax unsupported by block device\n", bdev);

		return false;

	}



	err = bdev_dax_pgoff(bdev, start, PAGE_SIZE, &pgoff);

	if (err) {

		pr_info("%s: error: unaligned partition for dax\n",

				bdevname(bdev, buf));

		pr_info("%pg: error: unaligned partition for dax\n", bdev);

		return false;

	}



	last_page = PFN_DOWN((start + sectors - 1) * 512) * PAGE_SIZE / 512;

	err = bdev_dax_pgoff(bdev, last_page, PAGE_SIZE, &pgoff_end);

	if (err) {

		pr_info("%s: error: unaligned partition for dax\n",

				bdevname(bdev, buf));

		pr_info("%pg: error: unaligned partition for dax\n", bdev);

		return false;

	}
@@ -112,8 +107,8 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev, 
	len2 = dax_direct_access(dax_dev, pgoff_end, 1, &end_kaddr, &end_pfn);



	if (len < 1 || len2 < 1) {

		pr_info("%s: error: dax access failed (%ld)\n",

				bdevname(bdev, buf), len < 1 ? len : len2);

		pr_info("%pg: error: dax access failed (%ld)\n",

				bdev, len < 1 ? len : len2);

		dax_read_unlock(id);

		return false;

	}
@@ -147,8 +142,7 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev, 
	dax_read_unlock(id);



	if (!dax_enabled) {

		pr_info("%s: error: dax support not enabled\n",

				bdevname(bdev, buf));

		pr_info("%pg: error: dax support not enabled\n", bdev);

		return false;

	}

	return true;