3 files changed, 15 insertions, 23 deletions

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 9d6486d416a3..44c2bdced1c8 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -618,12 +618,10 @@ static void release_buffer_page(struct buffer_head *bh)
 
 static void reiserfs_end_buffer_io_sync(struct buffer_head *bh, int uptodate)
 {
-        char b[BDEVNAME_SIZE];
-
         if (buffer_journaled(bh)) {
                 reiserfs_warning(NULL, "clm-2084",
-                                 "pinned buffer %lu:%s sent to disk",
-                                 bh->b_blocknr, bdevname(bh->b_bdev, b));
+                                 "pinned buffer %lu:%pg sent to disk",
+                                 bh->b_blocknr, bh->b_bdev);
         }
         if (uptodate)
                 set_buffer_uptodate(bh);
@@ -2387,11 +2385,10 @@ static int journal_read(struct super_block *sb)
         int replay_count = 0;
         int continue_replay = 1;
         int ret;
-        char b[BDEVNAME_SIZE];
 
         cur_dblock = SB_ONDISK_JOURNAL_1st_BLOCK(sb);
-        reiserfs_info(sb, "checking transaction log (%s)\n",
-                      bdevname(journal->j_dev_bd, b));
+        reiserfs_info(sb, "checking transaction log (%pg)\n",
+                      journal->j_dev_bd);
         start = get_seconds();
 
         /*
@@ -2651,8 +2648,8 @@ static int journal_init_dev(struct super_block *super,
 
         set_blocksize(journal->j_dev_bd, super->s_blocksize);
         reiserfs_info(super,
-                      "journal_init_dev: journal device: %s\n",
-                      bdevname(journal->j_dev_bd, b));
+                      "journal_init_dev: journal device: %pg\n",
+                      journal->j_dev_bd);
         return 0;
 }
 
@@ -2724,7 +2721,6 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
         struct reiserfs_journal_header *jh;
         struct reiserfs_journal *journal;
         struct reiserfs_journal_list *jl;
-        char b[BDEVNAME_SIZE];
         int ret;
 
         journal = SB_JOURNAL(sb) = vzalloc(sizeof(struct reiserfs_journal));
@@ -2794,10 +2790,10 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
             && (le32_to_cpu(jh->jh_journal.jp_journal_magic) !=
                 sb_jp_journal_magic(rs))) {
                 reiserfs_warning(sb, "sh-460",
-                                 "journal header magic %x (device %s) does "
+                                 "journal header magic %x (device %pg) does "
                                  "not match to magic found in super block %x",
                                  jh->jh_journal.jp_journal_magic,
-                                 bdevname(journal->j_dev_bd, b),
+                                 journal->j_dev_bd,
                                  sb_jp_journal_magic(rs));
                 brelse(bhjh);
                 goto free_and_return;
@@ -2818,10 +2814,10 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
                 journal->j_max_trans_age = commit_max_age;
         }
 
-        reiserfs_info(sb, "journal params: device %s, size %u, "
+        reiserfs_info(sb, "journal params: device %pg, size %u, "
                       "journal first block %u, max trans len %u, max batch %u, "
                       "max commit age %u, max trans age %u\n",
-                      bdevname(journal->j_dev_bd, b),
+                      journal->j_dev_bd,
                       SB_ONDISK_JOURNAL_SIZE(sb),
                       SB_ONDISK_JOURNAL_1st_BLOCK(sb),
                       journal->j_trans_max,
diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index ae1dc841db3a..4f3f928076f3 100644
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -139,11 +139,9 @@ static void sprintf_block_head(char *buf, struct buffer_head *bh)
 
 static void sprintf_buffer_head(char *buf, struct buffer_head *bh)
 {
-        char b[BDEVNAME_SIZE];
-
         sprintf(buf,
-                "dev %s, size %zd, blocknr %llu, count %d, state 0x%lx, page %p, (%s, %s, %s)",
-                bdevname(bh->b_bdev, b), bh->b_size,
+                "dev %pg, size %zd, blocknr %llu, count %d, state 0x%lx, page %p, (%s, %s, %s)",
+                bh->b_bdev, bh->b_size,
                 (unsigned long long)bh->b_blocknr, atomic_read(&(bh->b_count)),
                 bh->b_state, bh->b_page,
                 buffer_uptodate(bh) ? "UPTODATE" : "!UPTODATE",
@@ -530,7 +528,6 @@ static int print_super_block(struct buffer_head *bh)
             (struct reiserfs_super_block *)(bh->b_data);
         int skipped, data_blocks;
         char *version;
-        char b[BDEVNAME_SIZE];
 
         if (is_reiserfs_3_5(rs)) {
                 version = "3.5";
@@ -543,7 +540,7 @@ static int print_super_block(struct buffer_head *bh)
                 return 1;
         }
 
-        printk("%s\'s super block is in block %llu\n", bdevname(bh->b_bdev, b),
+        printk("%pg\'s super block is in block %llu\n", bh->b_bdev,
                (unsigned long long)bh->b_blocknr);
         printk("Reiserfs version %s\n", version);
         printk("Block count %u\n", sb_block_count(rs));
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index 621b9f381fe1..fe999157dd97 100644
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -303,11 +303,10 @@ static int show_journal(struct seq_file *m, void *unused)
         struct reiserfs_sb_info *r = REISERFS_SB(sb);
         struct reiserfs_super_block *rs = r->s_rs;
         struct journal_params *jp = &rs->s_v1.s_journal;
-        char b[BDEVNAME_SIZE];
 
         seq_printf(m,           /* on-disk fields */
                    "jp_journal_1st_block: \t%i\n"
-                   "jp_journal_dev: \t%s[%x]\n"
+                   "jp_journal_dev: \t%pg[%x]\n"
                    "jp_journal_size: \t%i\n"
                    "jp_journal_trans_max: \t%i\n"
                    "jp_journal_magic: \t%i\n"
@@ -348,7 +347,7 @@ static int show_journal(struct seq_file *m, void *unused)
                    "prepare: \t%12lu\n"
                    "prepare_retry: \t%12lu\n",
                    DJP(jp_journal_1st_block),
-                   bdevname(SB_JOURNAL(sb)->j_dev_bd, b),
+                   SB_JOURNAL(sb)->j_dev_bd,
                    DJP(jp_journal_dev),
                    DJP(jp_journal_size),
                    DJP(jp_journal_trans_max),