diff mbox series

[06/10] md-multipath: stop using bio_devname

Message ID 20220304180105.409765-7-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series [01/10] block: fix and cleanup bio_check_ro | expand

Commit Message

Christoph Hellwig March 4, 2022, 6:01 p.m. UTC 
Use the %pg format specifier to save on stack consuption and code size.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/md/md-multipath.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Song Liu March 4, 2022, 7:14 p.m. UTC | #1 
On Fri, Mar 4, 2022 at 10:01 AM Christoph Hellwig <hch@lst.de> wrote:
>
> Use the %pg format specifier to save on stack consuption and code size.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Acked-by: Song Liu <song@kernel.org>

> ---
>  drivers/md/md-multipath.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/md/md-multipath.c b/drivers/md/md-multipath.c
> index c056a7d707b09..bc38a6133cda3 100644
> --- a/drivers/md/md-multipath.c
> +++ b/drivers/md/md-multipath.c
> @@ -294,7 +294,6 @@ static void multipathd(struct md_thread *thread)
>
>         md_check_recovery(mddev);
>         for (;;) {
> -               char b[BDEVNAME_SIZE];
>                 spin_lock_irqsave(&conf->device_lock, flags);
>                 if (list_empty(head))
>                         break;
> @@ -306,13 +305,13 @@ static void multipathd(struct md_thread *thread)
>                 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 +=
> --
> 2.30.2
>
Chaitanya Kulkarni March 7, 2022, 3:07 a.m. UTC | #2 
On 3/4/22 10:01, Christoph Hellwig wrote:
> Use the %pg format specifier to save on stack consuption and code size.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---

Looks good.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
diff mbox series

Patch

diff --git a/drivers/md/md-multipath.c b/drivers/md/md-multipath.c
index c056a7d707b09..bc38a6133cda3 100644
--- a/drivers/md/md-multipath.c
+++ b/drivers/md/md-multipath.c
@@ -294,7 +294,6 @@  static void multipathd(struct md_thread *thread)
 
 	md_check_recovery(mddev);
 	for (;;) {
-		char b[BDEVNAME_SIZE];
 		spin_lock_irqsave(&conf->device_lock, flags);
 		if (list_empty(head))
 			break;
@@ -306,13 +305,13 @@  static void multipathd(struct md_thread *thread)
 		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 +=