Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
bcache: remove the backing_dev_name field from struct cached_dev
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-7-colyli@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
authored by
Christoph Hellwig
and committed by
Jens Axboe
0f5cd781
7e84c215
+29
-39
-2
drivers/md/bcache/bcache.h
-2
drivers/md/bcache/bcache.h
+2
-2
drivers/md/bcache/debug.c
+2
-2
drivers/md/bcache/debug.c
+4
-4
drivers/md/bcache/io.c
+4
-4
drivers/md/bcache/io.c
···
65
65
* we shouldn't count failed REQ_RAHEAD bio to dc->io_errors.
66
66
*/
67
67
if (bio->bi_opf & REQ_RAHEAD) {
68
-
pr_warn_ratelimited("%s: Read-ahead I/O failed on backing device, ignore\n",
69
-
dc->backing_dev_name);
68
+
pr_warn_ratelimited("%pg: Read-ahead I/O failed on backing device, ignore\n",
69
+
dc->bdev);
70
70
return;
71
71
}
72
72
73
73
errors = atomic_add_return(1, &dc->io_errors);
74
74
if (errors < dc->error_limit)
75
-
pr_err("%s: IO error on backing device, unrecoverable\n",
76
-
dc->backing_dev_name);
75
+
pr_err("%pg: IO error on backing device, unrecoverable\n",
76
+
dc->bdev);
77
77
else
78
78
bch_cached_dev_error(dc);
79
79
}
+2
-2
drivers/md/bcache/request.c
+2
-2
drivers/md/bcache/request.c
···
651
651
*/
652
652
if (unlikely(s->iop.writeback &&
653
653
bio->bi_opf & REQ_PREFLUSH)) {
654
-
pr_err("Can't flush %s: returned bi_status %i\n",
655
-
dc->backing_dev_name, bio->bi_status);
654
+
pr_err("Can't flush %pg: returned bi_status %i\n",
655
+
dc->bdev, bio->bi_status);
656
656
} else {
657
657
/* set to orig_bio->bi_status in bio_complete() */
658
658
s->iop.status = bio->bi_status;
+20
-28
drivers/md/bcache/super.c
+20
-28
drivers/md/bcache/super.c
···
1026
1026
dc->offline_seconds = 0;
1027
1027
1028
1028
if (dc->offline_seconds >= BACKING_DEV_OFFLINE_TIMEOUT) {
1029
-
pr_err("%s: device offline for %d seconds\n",
1030
-
dc->backing_dev_name,
1029
+
pr_err("%pg: device offline for %d seconds\n",
1030
+
dc->bdev,
1031
1031
BACKING_DEV_OFFLINE_TIMEOUT);
1032
1032
pr_err("%s: disable I/O request due to backing device offline\n",
1033
1033
dc->disk.name);
···
1058
1058
};
1059
1059
1060
1060
if (dc->io_disable) {
1061
-
pr_err("I/O disabled on cached dev %s\n",
1062
-
dc->backing_dev_name);
1061
+
pr_err("I/O disabled on cached dev %pg\n", dc->bdev);
1063
1062
ret = -EIO;
1064
1063
goto out;
1065
1064
}
1066
1065
1067
1066
if (atomic_xchg(&dc->running, 1)) {
1068
-
pr_info("cached dev %s is running already\n",
1069
-
dc->backing_dev_name);
1067
+
pr_info("cached dev %pg is running already\n", dc->bdev);
1070
1068
ret = -EBUSY;
1071
1069
goto out;
1072
1070
}
···
1161
1163
1162
1164
mutex_unlock(&bch_register_lock);
1163
1165
1164
-
pr_info("Caching disabled for %s\n", dc->backing_dev_name);
1166
+
pr_info("Caching disabled for %pg\n", dc->bdev);
1165
1167
1166
1168
/* Drop ref we took in cached_dev_detach() */
1167
1169
closure_put(&dc->disk.cl);
···
1201
1203
return -ENOENT;
1202
1204
1203
1205
if (dc->disk.c) {
1204
-
pr_err("Can't attach %s: already attached\n",
1205
-
dc->backing_dev_name);
1206
+
pr_err("Can't attach %pg: already attached\n", dc->bdev);
1206
1207
return -EINVAL;
1207
1208
}
1208
1209
1209
1210
if (test_bit(CACHE_SET_STOPPING, &c->flags)) {
1210
-
pr_err("Can't attach %s: shutting down\n",
1211
-
dc->backing_dev_name);
1211
+
pr_err("Can't attach %pg: shutting down\n", dc->bdev);
1212
1212
return -EINVAL;
1213
1213
}
1214
1214
1215
1215
if (dc->sb.block_size < c->cache->sb.block_size) {
1216
1216
/* Will die */
1217
-
pr_err("Couldn't attach %s: block size less than set's block size\n",
1218
-
dc->backing_dev_name);
1217
+
pr_err("Couldn't attach %pg: block size less than set's block size\n",
1218
+
dc->bdev);
1219
1219
return -EINVAL;
1220
1220
}
1221
1221
1222
1222
/* Check whether already attached */
1223
1223
list_for_each_entry_safe(exist_dc, t, &c->cached_devs, list) {
1224
1224
if (!memcmp(dc->sb.uuid, exist_dc->sb.uuid, 16)) {
1225
-
pr_err("Tried to attach %s but duplicate UUID already attached\n",
1226
-
dc->backing_dev_name);
1225
+
pr_err("Tried to attach %pg but duplicate UUID already attached\n",
1226
+
dc->bdev);
1227
1227
1228
1228
return -EINVAL;
1229
1229
}
···
1239
1243
1240
1244
if (!u) {
1241
1245
if (BDEV_STATE(&dc->sb) == BDEV_STATE_DIRTY) {
1242
-
pr_err("Couldn't find uuid for %s in set\n",
1243
-
dc->backing_dev_name);
1246
+
pr_err("Couldn't find uuid for %pg in set\n", dc->bdev);
1244
1247
return -ENOENT;
1245
1248
}
1246
1249
1247
1250
u = uuid_find_empty(c);
1248
1251
if (!u) {
1249
-
pr_err("Not caching %s, no room for UUID\n",
1250
-
dc->backing_dev_name);
1252
+
pr_err("Not caching %pg, no room for UUID\n", dc->bdev);
1251
1253
return -EINVAL;
1252
1254
}
1253
1255
}
···
1313
1319
*/
1314
1320
kthread_stop(dc->writeback_thread);
1315
1321
cancel_writeback_rate_update_dwork(dc);
1316
-
pr_err("Couldn't run cached device %s\n",
1317
-
dc->backing_dev_name);
1322
+
pr_err("Couldn't run cached device %pg\n", dc->bdev);
1318
1323
return ret;
1319
1324
}
1320
1325
···
1329
1336
/* Allow the writeback thread to proceed */
1330
1337
up_write(&dc->writeback_lock);
1331
1338
1332
-
pr_info("Caching %s as %s on set %pU\n",
1333
-
dc->backing_dev_name,
1339
+
pr_info("Caching %pg as %s on set %pU\n",
1340
+
dc->bdev,
1334
1341
dc->disk.disk->disk_name,
1335
1342
dc->disk.c->set_uuid);
1336
1343
return 0;
···
1454
1461
struct cache_set *c;
1455
1462
int ret = -ENOMEM;
1456
1463
1457
-
bdevname(bdev, dc->backing_dev_name);
1458
1464
memcpy(&dc->sb, sb, sizeof(struct cache_sb));
1459
1465
dc->bdev = bdev;
1460
1466
dc->bdev->bd_holder = dc;
···
1468
1476
if (bch_cache_accounting_add_kobjs(&dc->accounting, &dc->disk.kobj))
1469
1477
goto err;
1470
1478
1471
-
pr_info("registered backing device %s\n", dc->backing_dev_name);
1479
+
pr_info("registered backing device %pg\n", dc->bdev);
1472
1480
1473
1481
list_add(&dc->list, &uncached_devices);
1474
1482
/* attach to a matched cache set if it exists */
···
1485
1493
1486
1494
return 0;
1487
1495
err:
1488
-
pr_notice("error %s: %s\n", dc->backing_dev_name, err);
1496
+
pr_notice("error %pg: %s\n", dc->bdev, err);
1489
1497
bcache_device_stop(&dc->disk);
1490
1498
return ret;
1491
1499
}
···
1613
1621
/* make others know io_disable is true earlier */
1614
1622
smp_mb();
1615
1623
1616
-
pr_err("stop %s: too many IO errors on backing device %s\n",
1617
-
dc->disk.disk->disk_name, dc->backing_dev_name);
1624
+
pr_err("stop %s: too many IO errors on backing device %pg\n",
1625
+
dc->disk.disk->disk_name, dc->bdev);
1618
1626
1619
1627
bcache_device_stop(&dc->disk);
1620
1628
return true;