Skip to content
Snippets Groups Projects
Commit 7e84c215 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

bcache: remove the cache_dev_name field from struct cache


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

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarColy Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20211020143812.6403-6-colyli@suse.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0259d449
No related branches found
No related tags found
Loading
...@@ -470,8 +470,6 @@ struct cache { ...@@ -470,8 +470,6 @@ struct cache {
atomic_long_t meta_sectors_written; atomic_long_t meta_sectors_written;
atomic_long_t btree_sectors_written; atomic_long_t btree_sectors_written;
atomic_long_t sectors_written; atomic_long_t sectors_written;
char cache_dev_name[BDEVNAME_SIZE];
}; };
struct gc_stat { struct gc_stat {
......
...@@ -123,13 +123,13 @@ void bch_count_io_errors(struct cache *ca, ...@@ -123,13 +123,13 @@ void bch_count_io_errors(struct cache *ca,
errors >>= IO_ERROR_SHIFT; errors >>= IO_ERROR_SHIFT;
if (errors < ca->set->error_limit) if (errors < ca->set->error_limit)
pr_err("%s: IO error on %s%s\n", pr_err("%pg: IO error on %s%s\n",
ca->cache_dev_name, m, ca->bdev, m,
is_read ? ", recovering." : "."); is_read ? ", recovering." : ".");
else else
bch_cache_set_error(ca->set, bch_cache_set_error(ca->set,
"%s: too many IO errors %s\n", "%pg: too many IO errors %s\n",
ca->cache_dev_name, m); ca->bdev, m);
} }
} }
......
...@@ -2338,7 +2338,7 @@ static int cache_alloc(struct cache *ca) ...@@ -2338,7 +2338,7 @@ static int cache_alloc(struct cache *ca)
err_free: err_free:
module_put(THIS_MODULE); module_put(THIS_MODULE);
if (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; return ret;
} }
...@@ -2348,7 +2348,6 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk, ...@@ -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 */ const char *err = NULL; /* must be set for any error case */
int ret = 0; int ret = 0;
bdevname(bdev, ca->cache_dev_name);
memcpy(&ca->sb, sb, sizeof(struct cache_sb)); memcpy(&ca->sb, sb, sizeof(struct cache_sb));
ca->bdev = bdev; ca->bdev = bdev;
ca->bdev->bd_holder = ca; ca->bdev->bd_holder = ca;
...@@ -2390,14 +2389,14 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk, ...@@ -2390,14 +2389,14 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk,
goto out; goto out;
} }
pr_info("registered cache device %s\n", ca->cache_dev_name); pr_info("registered cache device %pg\n", ca->bdev);
out: out:
kobject_put(&ca->kobj); kobject_put(&ca->kobj);
err: err:
if (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; return ret;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment