1 files changed, 2 insertions, 8 deletions

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 179d7d8733f2..4ff3fad4e9e3 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1135,7 +1135,6 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
 {
         journal_t *journal = journal_init_common();
         struct buffer_head *bh;
-        char *p;
         int n;
 
         if (!journal)
@@ -1148,9 +1147,7 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
         journal->j_blk_offset = start;
         journal->j_maxlen = len;
         bdevname(journal->j_dev, journal->j_devname);
-        p = journal->j_devname;
-        while ((p = strchr(p, '/')))
-                *p = '!';
+        strreplace(journal->j_devname, '/', '!');
         jbd2_stats_proc_init(journal);
         n = journal->j_blocksize / sizeof(journal_block_tag_t);
         journal->j_wbufsize = n;
@@ -1202,10 +1199,7 @@ journal_t * jbd2_journal_init_inode (struct inode *inode)
         journal->j_dev = journal->j_fs_dev = inode->i_sb->s_bdev;
         journal->j_inode = inode;
         bdevname(journal->j_dev, journal->j_devname);
-        p = journal->j_devname;
-        while ((p = strchr(p, '/')))
-                *p = '!';
-        p = journal->j_devname + strlen(journal->j_devname);
+        p = strreplace(journal->j_devname, '/', '!');
         sprintf(p, "-%lu", journal->j_inode->i_ino);
         jbd_debug(1,
                   "journal %p: inode %s/%ld, size %Ld, bits %d, blksize %ld\n",