@@ -73,37 +73,32 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,
73
73
{
74
74
bool dax_enabled = false;
75
75
pgoff_t pgoff , pgoff_end ;
76
- char buf [BDEVNAME_SIZE ];
77
76
void * kaddr , * end_kaddr ;
78
77
pfn_t pfn , end_pfn ;
79
78
sector_t last_page ;
80
79
long len , len2 ;
81
80
int err , id ;
82
81
83
82
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 );
86
84
return false;
87
85
}
88
86
89
87
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 );
92
89
return false;
93
90
}
94
91
95
92
err = bdev_dax_pgoff (bdev , start , PAGE_SIZE , & pgoff );
96
93
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 );
99
95
return false;
100
96
}
101
97
102
98
last_page = PFN_DOWN ((start + sectors - 1 ) * 512 ) * PAGE_SIZE / 512 ;
103
99
err = bdev_dax_pgoff (bdev , last_page , PAGE_SIZE , & pgoff_end );
104
100
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 );
107
102
return false;
108
103
}
109
104
@@ -112,8 +107,8 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,
112
107
len2 = dax_direct_access (dax_dev , pgoff_end , 1 , & end_kaddr , & end_pfn );
113
108
114
109
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 );
117
112
dax_read_unlock (id );
118
113
return false;
119
114
}
@@ -147,8 +142,7 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,
147
142
dax_read_unlock (id );
148
143
149
144
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 );
152
146
return false;
153
147
}
154
148
return true;
0 commit comments