bcache: remove the cache_dev_name field from struct cache

Just use the %pg format specifier to print the name directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Coly Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20211020143812.6403-6-colyli@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
index 5fc989a6d452888f2645d00b12cf5c84cfed4ba3..47ff9ecea2e296c75331a2572160cc4f421397e5 100644 (file)
--- a/drivers/md/bcache/bcache.h
+++ b/drivers/md/bcache/bcache.h
@@ -470,8 +470,6 @@ struct cache {
        atomic_long_t           meta_sectors_written;
        atomic_long_t           btree_sectors_written;
        atomic_long_t           sectors_written;
-
-       char                    cache_dev_name[BDEVNAME_SIZE];
 };
 
 struct gc_stat {

diff --git a/drivers/md/bcache/io.c b/drivers/md/bcache/io.c
index e4388fe3ab7ef96ead612d775ce64270ec9ea318..564357de76404d27da9b5a2f0fe9522c725aa100 100644 (file)
--- a/drivers/md/bcache/io.c
+++ b/drivers/md/bcache/io.c
@@ -123,13 +123,13 @@ void bch_count_io_errors(struct cache *ca,
                errors >>= IO_ERROR_SHIFT;
 
                if (errors < ca->set->error_limit)
-                       pr_err("%s: IO error on %s%s\n",
-                              ca->cache_dev_name, m,
+                       pr_err("%pg: IO error on %s%s\n",
+                              ca->bdev, m,
                               is_read ? ", recovering." : ".");
                else
                        bch_cache_set_error(ca->set,
-                                           "%s: too many IO errors %s\n",
-                                           ca->cache_dev_name, m);
+                                           "%pg: too many IO errors %s\n",
+                                           ca->bdev, m);
        }
 }
 

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index dced2ea17431996ea4533e6850e0e2ee71d93de1..88cdce218f5c6212291fdfc92e634f6615b6dd84 100644 (file)
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -2338,7 +2338,7 @@ err_btree_alloc:
 err_free:
        module_put(THIS_MODULE);
        if (err)
-               pr_notice("error %s: %s\n", ca->cache_dev_name, err);
+               pr_notice("error %pg: %s\n", ca->bdev, err);
        return ret;
 }
 
@@ -2348,7 +2348,6 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk,
        const char *err = NULL; /* must be set for any error case */
        int ret = 0;
 
-       bdevname(bdev, ca->cache_dev_name);
        memcpy(&ca->sb, sb, sizeof(struct cache_sb));
        ca->bdev = bdev;
        ca->bdev->bd_holder = ca;
@@ -2390,14 +2389,14 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk,
                goto out;
        }
 
-       pr_info("registered cache device %s\n", ca->cache_dev_name);
+       pr_info("registered cache device %pg\n", ca->bdev);
 
 out:
        kobject_put(&ca->kobj);
 
 err:
        if (err)
-               pr_notice("error %s: %s\n", ca->cache_dev_name, err);
+               pr_notice("error %pg: %s\n", ca->bdev, err);
 
        return ret;
 }