Skip to content

Commit 39b6389

Browse files
Christoph Hellwigdjbw
authored andcommitted
dax: stop using bdevname
Just use the %pg format specifier instead. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Dan Williams <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dan Williams <[email protected]>
1 parent 6c97ec1 commit 39b6389

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

drivers/dax/super.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,37 +73,32 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,
7373
{
7474
bool dax_enabled = false;
7575
pgoff_t pgoff, pgoff_end;
76-
char buf[BDEVNAME_SIZE];
7776
void *kaddr, *end_kaddr;
7877
pfn_t pfn, end_pfn;
7978
sector_t last_page;
8079
long len, len2;
8180
int err, id;
8281

8382
if (blocksize != PAGE_SIZE) {
84-
pr_info("%s: error: unsupported blocksize for dax\n",
85-
bdevname(bdev, buf));
83+
pr_info("%pg: error: unsupported blocksize for dax\n", bdev);
8684
return false;
8785
}
8886

8987
if (!dax_dev) {
90-
pr_debug("%s: error: dax unsupported by block device\n",
91-
bdevname(bdev, buf));
88+
pr_debug("%pg: error: dax unsupported by block device\n", bdev);
9289
return false;
9390
}
9491

9592
err = bdev_dax_pgoff(bdev, start, PAGE_SIZE, &pgoff);
9693
if (err) {
97-
pr_info("%s: error: unaligned partition for dax\n",
98-
bdevname(bdev, buf));
94+
pr_info("%pg: error: unaligned partition for dax\n", bdev);
9995
return false;
10096
}
10197

10298
last_page = PFN_DOWN((start + sectors - 1) * 512) * PAGE_SIZE / 512;
10399
err = bdev_dax_pgoff(bdev, last_page, PAGE_SIZE, &pgoff_end);
104100
if (err) {
105-
pr_info("%s: error: unaligned partition for dax\n",
106-
bdevname(bdev, buf));
101+
pr_info("%pg: error: unaligned partition for dax\n", bdev);
107102
return false;
108103
}
109104

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

114109
if (len < 1 || len2 < 1) {
115-
pr_info("%s: error: dax access failed (%ld)\n",
116-
bdevname(bdev, buf), len < 1 ? len : len2);
110+
pr_info("%pg: error: dax access failed (%ld)\n",
111+
bdev, len < 1 ? len : len2);
117112
dax_read_unlock(id);
118113
return false;
119114
}
@@ -147,8 +142,7 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,
147142
dax_read_unlock(id);
148143

149144
if (!dax_enabled) {
150-
pr_info("%s: error: dax support not enabled\n",
151-
bdevname(bdev, buf));
145+
pr_info("%pg: error: dax support not enabled\n", bdev);
152146
return false;
153147
}
154148
return true;

0 commit comments

Comments
 (0)