1 files changed, 6 insertions, 15 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 4f4cd959da7c..e1632abb4ca9 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -134,13 +134,10 @@ __clear_page_buffers(struct page *page)
 
 static void buffer_io_error(struct buffer_head *bh, char *msg)
 {
-        char b[BDEVNAME_SIZE];
-
         if (!test_bit(BH_Quiet, &bh->b_state))
                 printk_ratelimited(KERN_ERR
-                        "Buffer I/O error on dev %s, logical block %llu%s\n",
-                        bdevname(bh->b_bdev, b),
-                        (unsigned long long)bh->b_blocknr, msg);
+                        "Buffer I/O error on dev %pg, logical block %llu%s\n",
+                        bh->b_bdev, (unsigned long long)bh->b_blocknr, msg);
 }
 
 /*
@@ -237,15 +234,13 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
          * elsewhere, don't buffer_error if we had some unmapped buffers
          */
         if (all_mapped) {
-                char b[BDEVNAME_SIZE];
-
                 printk("__find_get_block_slow() failed. "
                         "block=%llu, b_blocknr=%llu\n",
                         (unsigned long long)block,
                         (unsigned long long)bh->b_blocknr);
                 printk("b_state=0x%08lx, b_size=%zu\n",
                         bh->b_state, bh->b_size);
-                printk("device %s blocksize: %d\n", bdevname(bdev, b),
+                printk("device %pg blocksize: %d\n", bdev,
                         1 << bd_inode->i_blkbits);
         }
 out_unlock:
@@ -531,10 +526,8 @@ repeat:
 
 static void do_thaw_one(struct super_block *sb, void *unused)
 {
-        char b[BDEVNAME_SIZE];
         while (sb->s_bdev && !thaw_bdev(sb->s_bdev, sb))
-                printk(KERN_WARNING "Emergency Thaw on %s\n",
-                       bdevname(sb->s_bdev, b));
+                printk(KERN_WARNING "Emergency Thaw on %pg\n", sb->s_bdev);
 }
 
 static void do_thaw_all(struct work_struct *work)
@@ -1074,12 +1067,10 @@ grow_buffers(struct block_device *bdev, sector_t block, int size, gfp_t gfp)
          * pagecache index.  (this comparison is done using sector_t types).
          */
         if (unlikely(index != block >> sizebits)) {
-                char b[BDEVNAME_SIZE];
-
                 printk(KERN_ERR "%s: requested out-of-range block %llu for "
-                        "device %s\n",
+                        "device %pg\n",
                         __func__, (unsigned long long)block,
-                        bdevname(bdev, b));
+                        bdev);
                 return -EIO;
         }