tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Christoph Hellwig and committed by
Jens Axboe 7e84c215 0259d449

+7 -10
-2
drivers/md/bcache/bcache.h
··· 470 470 atomic_long_t meta_sectors_written; 471 471 atomic_long_t btree_sectors_written; 472 472 atomic_long_t sectors_written; 473 - 474 - char cache_dev_name[BDEVNAME_SIZE]; 475 473 }; 476 474 477 475 struct gc_stat {
+4 -4
drivers/md/bcache/io.c
··· 123 123 errors >>= IO_ERROR_SHIFT; 124 124 125 125 if (errors < ca->set->error_limit) 126 - pr_err("%s: IO error on %s%s\n", 127 - ca->cache_dev_name, m, 126 + pr_err("%pg: IO error on %s%s\n", 127 + ca->bdev, m, 128 128 is_read ? ", recovering." : "."); 129 129 else 130 130 bch_cache_set_error(ca->set, 131 - "%s: too many IO errors %s\n", 132 - ca->cache_dev_name, m); 131 + "%pg: too many IO errors %s\n", 132 + ca->bdev, m); 133 133 } 134 134 } 135 135
+3 -4
drivers/md/bcache/super.c
··· 2338 2338 err_free: 2339 2339 module_put(THIS_MODULE); 2340 2340 if (err) 2341 - pr_notice("error %s: %s\n", ca->cache_dev_name, err); 2341 + pr_notice("error %pg: %s\n", ca->bdev, err); 2342 2342 return ret; 2343 2343 } 2344 2344 ··· 2348 2348 const char *err = NULL; /* must be set for any error case */ 2349 2349 int ret = 0; 2350 2350 2351 - bdevname(bdev, ca->cache_dev_name); 2352 2351 memcpy(&ca->sb, sb, sizeof(struct cache_sb)); 2353 2352 ca->bdev = bdev; 2354 2353 ca->bdev->bd_holder = ca; ··· 2389 2390 goto out; 2390 2391 } 2391 2392 2392 - pr_info("registered cache device %s\n", ca->cache_dev_name); 2393 + pr_info("registered cache device %pg\n", ca->bdev); 2393 2394 2394 2395 out: 2395 2396 kobject_put(&ca->kobj); 2396 2397 2397 2398 err: 2398 2399 if (err) 2399 - pr_notice("error %s: %s\n", ca->cache_dev_name, err); 2400 + pr_notice("error %pg: %s\n", ca->bdev, err); 2400 2401 2401 2402 return ret; 2402 2403 }