md_check_recovery(mddev);
        for (;;) {
-               char b[BDEVNAME_SIZE];
                spin_lock_irqsave(&conf->device_lock, flags);
                if (list_empty(head))
                        break;
                bio->bi_iter.bi_sector = mp_bh->master_bio->bi_iter.bi_sector;
 
                if ((mp_bh->path = multipath_map (conf))<0) {
-                       pr_err("multipath: %s: unrecoverable IO read error for block %llu\n",
-                              bio_devname(bio, b),
+                       pr_err("multipath: %pg: unrecoverable IO read error for block %llu\n",
+                              bio->bi_bdev,
                               (unsigned long long)bio->bi_iter.bi_sector);
                        multipath_end_bh_io(mp_bh, BLK_STS_IOERR);
                } else {
-                       pr_err("multipath: %s: redirecting sector %llu to another IO path\n",
-                              bio_devname(bio, b),
+                       pr_err("multipath: %pg: redirecting sector %llu to another IO path\n",
+                              bio->bi_bdev,
                               (unsigned long long)bio->bi_iter.bi_sector);
                        *bio = *(mp_bh->master_bio);
                        bio->bi_iter.bi_sector +=