public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

md: remove most calls to bdevname

Browse source 
Use the %pg format specifier to save on stack consumption and code size.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Song Liu <song@kernel.org>
This commit is contained in:
Christoph Hellwig 2022-05-12 08:19:13 +02:00 • committed by Song Liu
parent 1e26774228
commit 913cce5a1e
9 changed files with 147 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/md/md-linear.c
View file

@ -206,7 +206,6 @@ static void linear_free(struct mddev *mddev, void *priv)
static bool linear_make_request(struct mddev *mddev, struct bio *bio) static bool linear_make_request(struct mddev *mddev, struct bio *bio)
{ {
char b[BDEVNAME_SIZE];
struct dev_info *tmp_dev; struct dev_info *tmp_dev;
sector_t start_sector, end_sector, data_offset; sector_t start_sector, end_sector, data_offset;
sector_t bio_sector = bio->bi_iter.bi_sector; sector_t bio_sector = bio->bi_iter.bi_sector;
@ -256,10 +255,10 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio)
return true; return true;
out_of_bounds: out_of_bounds:
pr_err("md/linear:%s: make_request: Sector %llu out of bounds on dev %s: %llu sectors, offset %llu\n", pr_err("md/linear:%s: make_request: Sector %llu out of bounds on dev %pg: %llu sectors, offset %llu\n",
mdname(mddev), mdname(mddev),
(unsigned long long)bio->bi_iter.bi_sector, (unsigned long long)bio->bi_iter.bi_sector,
bdevname(tmp_dev->rdev->bdev, b), tmp_dev->rdev->bdev,
(unsigned long long)tmp_dev->rdev->sectors, (unsigned long long)tmp_dev->rdev->sectors,
(unsigned long long)start_sector); (unsigned long long)start_sector);
bio_io_error(bio); bio_io_error(bio);

15
drivers/md/md-multipath.c
View file

@ -87,10 +87,9 @@ static void multipath_end_request(struct bio *bio)
/* /*
* oops, IO error: * oops, IO error:
*/ */
char b[BDEVNAME_SIZE];
md_error (mp_bh->mddev, rdev); md_error (mp_bh->mddev, rdev);
pr_info("multipath: %s: rescheduling sector %llu\n", pr_info("multipath: %pg: rescheduling sector %llu\n",
bdevname(rdev->bdev,b), rdev->bdev,
(unsigned long long)bio->bi_iter.bi_sector); (unsigned long long)bio->bi_iter.bi_sector);
multipath_reschedule_retry(mp_bh); multipath_reschedule_retry(mp_bh);
} else } else
@ -154,7 +153,6 @@ static void multipath_status(struct seq_file *seq, struct mddev *mddev)
static void multipath_error (struct mddev *mddev, struct md_rdev *rdev) static void multipath_error (struct mddev *mddev, struct md_rdev *rdev)
{ {
struct mpconf *conf = mddev->private; struct mpconf *conf = mddev->private;
char b[BDEVNAME_SIZE];
if (conf->raid_disks - mddev->degraded <= 1) { if (conf->raid_disks - mddev->degraded <= 1) {
/* /*
@ -177,9 +175,9 @@ static void multipath_error (struct mddev *mddev, struct md_rdev *rdev)
} }
set_bit(Faulty, &rdev->flags); set_bit(Faulty, &rdev->flags);
set_bit(MD_SB_CHANGE_DEVS, &mddev->sb_flags); set_bit(MD_SB_CHANGE_DEVS, &mddev->sb_flags);
pr_err("multipath: IO failure on %s, disabling IO path.\n" pr_err("multipath: IO failure on %pg, disabling IO path.\n"
"multipath: Operation continuing on %d IO paths.\n", "multipath: Operation continuing on %d IO paths.\n",
bdevname(rdev->bdev, b), rdev->bdev,
conf->raid_disks - mddev->degraded); conf->raid_disks - mddev->degraded);
} }
@ -197,12 +195,11 @@ static void print_multipath_conf (struct mpconf *conf)
conf->raid_disks); conf->raid_disks);
for (i = 0; i < conf->raid_disks; i++) { for (i = 0; i < conf->raid_disks; i++) {
char b[BDEVNAME_SIZE];
tmp = conf->multipaths + i; tmp = conf->multipaths + i;
if (tmp->rdev) if (tmp->rdev)
pr_debug(" disk%d, o:%d, dev:%s\n", pr_debug(" disk%d, o:%d, dev:%pg\n",
i,!test_bit(Faulty, &tmp->rdev->flags), i,!test_bit(Faulty, &tmp->rdev->flags),
bdevname(tmp->rdev->bdev,b)); tmp->rdev->bdev);
} }
} }

152
drivers/md/md.c
View file

@ -1021,8 +1021,6 @@ EXPORT_SYMBOL_GPL(sync_page_io);
static int read_disk_sb(struct md_rdev *rdev, int size) static int read_disk_sb(struct md_rdev *rdev, int size)
{ {
char b[BDEVNAME_SIZE];
if (rdev->sb_loaded) if (rdev->sb_loaded)
return 0; return 0;
@ -1032,8 +1030,8 @@ static int read_disk_sb(struct md_rdev *rdev, int size)
return 0; return 0;
fail: fail:
pr_err("md: disabled device %s, could not read superblock.\n", pr_err("md: disabled device %pg, could not read superblock.\n",
bdevname(rdev->bdev,b)); rdev->bdev);
return -EINVAL; return -EINVAL;
} }
@ -1179,7 +1177,6 @@ EXPORT_SYMBOL(md_check_no_bitmap);
*/ */
static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_version) static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_version)
{ {
char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
mdp_super_t *sb; mdp_super_t *sb;
int ret; int ret;
bool spare_disk = true; bool spare_disk = true;
@ -1198,19 +1195,19 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor
ret = -EINVAL; ret = -EINVAL;
bdevname(rdev->bdev, b);
sb = page_address(rdev->sb_page); sb = page_address(rdev->sb_page);
if (sb->md_magic != MD_SB_MAGIC) { if (sb->md_magic != MD_SB_MAGIC) {
pr_warn("md: invalid raid superblock magic on %s\n", b); pr_warn("md: invalid raid superblock magic on %pg\n",
rdev->bdev);
goto abort; goto abort;
} }
if (sb->major_version != 0 || if (sb->major_version != 0 ||
sb->minor_version < 90 || sb->minor_version < 90 ||
sb->minor_version > 91) { sb->minor_version > 91) {
pr_warn("Bad version number %d.%d on %s\n", pr_warn("Bad version number %d.%d on %pg\n",
sb->major_version, sb->minor_version, b); sb->major_version, sb->minor_version, rdev->bdev);
goto abort; goto abort;
} }
@ -1218,7 +1215,7 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor
goto abort; goto abort;
if (md_csum_fold(calc_sb_csum(sb)) != md_csum_fold(sb->sb_csum)) { if (md_csum_fold(calc_sb_csum(sb)) != md_csum_fold(sb->sb_csum)) {
pr_warn("md: invalid superblock checksum on %s\n", b); pr_warn("md: invalid superblock checksum on %pg\n", rdev->bdev);
goto abort; goto abort;
} }
@ -1250,13 +1247,13 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor
__u64 ev1, ev2; __u64 ev1, ev2;
mdp_super_t *refsb = page_address(refdev->sb_page); mdp_super_t *refsb = page_address(refdev->sb_page);
if (!md_uuid_equal(refsb, sb)) { if (!md_uuid_equal(refsb, sb)) {
pr_warn("md: %s has different UUID to %s\n", pr_warn("md: %pg has different UUID to %pg\n",
b, bdevname(refdev->bdev,b2)); rdev->bdev, refdev->bdev);
goto abort; goto abort;
} }
if (!md_sb_equal(refsb, sb)) { if (!md_sb_equal(refsb, sb)) {
pr_warn("md: %s has same UUID but different superblock to %s\n", pr_warn("md: %pg has same UUID but different superblock to %pg\n",
b, bdevname(refdev->bdev, b2)); rdev->bdev, refdev->bdev);
goto abort; goto abort;
} }
ev1 = md_event(sb); ev1 = md_event(sb);
@ -1620,7 +1617,6 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
int ret; int ret;
sector_t sb_start; sector_t sb_start;
sector_t sectors; sector_t sectors;
char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
int bmask; int bmask;
bool spare_disk = true; bool spare_disk = true;
@ -1664,13 +1660,13 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
return -EINVAL; return -EINVAL;
if (calc_sb_1_csum(sb) != sb->sb_csum) { if (calc_sb_1_csum(sb) != sb->sb_csum) {
pr_warn("md: invalid superblock checksum on %s\n", pr_warn("md: invalid superblock checksum on %pg\n",
bdevname(rdev->bdev,b)); rdev->bdev);
return -EINVAL; return -EINVAL;
} }
if (le64_to_cpu(sb->data_size) < 10) { if (le64_to_cpu(sb->data_size) < 10) {
pr_warn("md: data_size too small on %s\n", pr_warn("md: data_size too small on %pg\n",
bdevname(rdev->bdev,b)); rdev->bdev);
return -EINVAL; return -EINVAL;
} }
if (sb->pad0 || if (sb->pad0 ||
@ -1776,9 +1772,9 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
sb->level != refsb->level || sb->level != refsb->level ||
sb->layout != refsb->layout || sb->layout != refsb->layout ||
sb->chunksize != refsb->chunksize) { sb->chunksize != refsb->chunksize) {
pr_warn("md: %s has strangely different superblock to %s\n", pr_warn("md: %pg has strangely different superblock to %pg\n",
bdevname(rdev->bdev,b), rdev->bdev,
bdevname(refdev->bdev,b2)); refdev->bdev);
return -EINVAL; return -EINVAL;
} }
ev1 = le64_to_cpu(sb->events); ev1 = le64_to_cpu(sb->events);
@ -2365,7 +2361,6 @@ EXPORT_SYMBOL(md_integrity_register);
int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev) int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev)
{ {
struct blk_integrity *bi_mddev; struct blk_integrity *bi_mddev;
char name[BDEVNAME_SIZE];
if (!mddev->gendisk) if (!mddev->gendisk)
return 0; return 0;
@ -2376,8 +2371,8 @@ int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev)
return 0; return 0;
if (blk_integrity_compare(mddev->gendisk, rdev->bdev->bd_disk) != 0) { if (blk_integrity_compare(mddev->gendisk, rdev->bdev->bd_disk) != 0) {
pr_err("%s: incompatible integrity profile for %s\n", pr_err("%s: incompatible integrity profile for %pg\n",
mdname(mddev), bdevname(rdev->bdev, name)); mdname(mddev), rdev->bdev);
return -ENXIO; return -ENXIO;
} }
@ -2486,11 +2481,9 @@ static void rdev_delayed_delete(struct work_struct *ws)
static void unbind_rdev_from_array(struct md_rdev *rdev) static void unbind_rdev_from_array(struct md_rdev *rdev)
{ {
char b[BDEVNAME_SIZE];
bd_unlink_disk_holder(rdev->bdev, rdev->mddev->gendisk); bd_unlink_disk_holder(rdev->bdev, rdev->mddev->gendisk);
list_del_rcu(&rdev->same_set); list_del_rcu(&rdev->same_set);
pr_debug("md: unbind<%s>\n", bdevname(rdev->bdev,b)); pr_debug("md: unbind<%pg>\n", rdev->bdev);
mddev_destroy_serial_pool(rdev->mddev, rdev, false); mddev_destroy_serial_pool(rdev->mddev, rdev, false);
rdev->mddev = NULL; rdev->mddev = NULL;
sysfs_remove_link(&rdev->kobj, "block"); sysfs_remove_link(&rdev->kobj, "block");
@ -2543,9 +2536,7 @@ void md_autodetect_dev(dev_t dev);
static void export_rdev(struct md_rdev *rdev) static void export_rdev(struct md_rdev *rdev)
{ {
char b[BDEVNAME_SIZE]; pr_debug("md: export_rdev(%pg)\n", rdev->bdev);
pr_debug("md: export_rdev(%s)\n", bdevname(rdev->bdev,b));
md_rdev_clear(rdev); md_rdev_clear(rdev);
#ifndef MODULE #ifndef MODULE
if (test_bit(AutoDetected, &rdev->flags)) if (test_bit(AutoDetected, &rdev->flags))
@ -2803,8 +2794,6 @@ repeat:
rewrite: rewrite:
md_bitmap_update_sb(mddev->bitmap); md_bitmap_update_sb(mddev->bitmap);
rdev_for_each(rdev, mddev) { rdev_for_each(rdev, mddev) {
char b[BDEVNAME_SIZE];
if (rdev->sb_loaded != 1) if (rdev->sb_loaded != 1)
continue; /* no noise on spare devices */ continue; /* no noise on spare devices */
@ -2812,8 +2801,8 @@ rewrite:
md_super_write(mddev,rdev, md_super_write(mddev,rdev,
rdev->sb_start, rdev->sb_size, rdev->sb_start, rdev->sb_size,
rdev->sb_page); rdev->sb_page);
pr_debug("md: (write) %s's sb offset: %llu\n", pr_debug("md: (write) %pg's sb offset: %llu\n",
bdevname(rdev->bdev, b), rdev->bdev,
(unsigned long long)rdev->sb_start); (unsigned long long)rdev->sb_start);
rdev->sb_events = mddev->events; rdev->sb_events = mddev->events;
if (rdev->badblocks.size) { if (rdev->badblocks.size) {
@ -2825,8 +2814,8 @@ rewrite:
} }
} else } else
pr_debug("md: %s (skipping faulty)\n", pr_debug("md: %pg (skipping faulty)\n",
bdevname(rdev->bdev, b)); rdev->bdev);
if (mddev->level == LEVEL_MULTIPATH) if (mddev->level == LEVEL_MULTIPATH)
/* only need to write one superblock... */ /* only need to write one superblock... */
@ -3701,7 +3690,6 @@ EXPORT_SYMBOL_GPL(md_rdev_init);
*/ */
static struct md_rdev *md_import_device(dev_t newdev, int super_format, int super_minor) static struct md_rdev *md_import_device(dev_t newdev, int super_format, int super_minor)
{ {
char b[BDEVNAME_SIZE];
int err; int err;
struct md_rdev *rdev; struct md_rdev *rdev;
sector_t size; sector_t size;
@ -3725,8 +3713,8 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe
size = bdev_nr_bytes(rdev->bdev) >> BLOCK_SIZE_BITS; size = bdev_nr_bytes(rdev->bdev) >> BLOCK_SIZE_BITS;
if (!size) { if (!size) {
pr_warn("md: %s has zero or unknown size, marking faulty!\n", pr_warn("md: %pg has zero or unknown size, marking faulty!\n",
bdevname(rdev->bdev,b)); rdev->bdev);
err = -EINVAL; err = -EINVAL;
goto abort_free; goto abort_free;
} }
@ -3735,14 +3723,14 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe
err = super_types[super_format]. err = super_types[super_format].
load_super(rdev, NULL, super_minor); load_super(rdev, NULL, super_minor);
if (err == -EINVAL) { if (err == -EINVAL) {
pr_warn("md: %s does not have a valid v%d.%d superblock, not importing!\n", pr_warn("md: %pg does not have a valid v%d.%d superblock, not importing!\n",
bdevname(rdev->bdev,b), rdev->bdev,
super_format, super_minor); super_format, super_minor);
goto abort_free; goto abort_free;
} }
if (err < 0) { if (err < 0) {
pr_warn("md: could not read %s's sb, not importing!\n", pr_warn("md: could not read %pg's sb, not importing!\n",
bdevname(rdev->bdev,b)); rdev->bdev);
goto abort_free; goto abort_free;
} }
} }
@ -3765,7 +3753,6 @@ static int analyze_sbs(struct mddev *mddev)
{ {
int i; int i;
struct md_rdev *rdev, *freshest, *tmp; struct md_rdev *rdev, *freshest, *tmp;
char b[BDEVNAME_SIZE];
freshest = NULL; freshest = NULL;
rdev_for_each_safe(rdev, tmp, mddev) rdev_for_each_safe(rdev, tmp, mddev)
@ -3777,8 +3764,8 @@ static int analyze_sbs(struct mddev *mddev)
case 0: case 0:
break; break;
default: default:
pr_warn("md: fatal superblock inconsistency in %s -- removing from array\n", pr_warn("md: fatal superblock inconsistency in %pg -- removing from array\n",
bdevname(rdev->bdev,b)); rdev->bdev);
md_kick_rdev_from_array(rdev); md_kick_rdev_from_array(rdev);
} }
@ -3796,8 +3783,8 @@ static int analyze_sbs(struct mddev *mddev)
if (mddev->max_disks && if (mddev->max_disks &&
(rdev->desc_nr >= mddev->max_disks || (rdev->desc_nr >= mddev->max_disks ||
i > mddev->max_disks)) { i > mddev->max_disks)) {
pr_warn("md: %s: %s: only %d devices permitted\n", pr_warn("md: %s: %pg: only %d devices permitted\n",
mdname(mddev), bdevname(rdev->bdev, b), mdname(mddev), rdev->bdev,
mddev->max_disks); mddev->max_disks);
md_kick_rdev_from_array(rdev); md_kick_rdev_from_array(rdev);
continue; continue;
@ -3805,8 +3792,8 @@ static int analyze_sbs(struct mddev *mddev)
if (rdev != freshest) { if (rdev != freshest) {
if (super_types[mddev->major_version]. if (super_types[mddev->major_version].
validate_super(mddev, rdev)) { validate_super(mddev, rdev)) {
pr_warn("md: kicking non-fresh %s from array!\n", pr_warn("md: kicking non-fresh %pg from array!\n",
bdevname(rdev->bdev,b)); rdev->bdev);
md_kick_rdev_from_array(rdev); md_kick_rdev_from_array(rdev);
continue; continue;
} }
@ -5912,7 +5899,6 @@ int md_run(struct mddev *mddev)
/* Warn if this is a potentially silly /* Warn if this is a potentially silly
* configuration. * configuration.
*/ */
char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
struct md_rdev *rdev2; struct md_rdev *rdev2;
int warned = 0; int warned = 0;
@ -5921,10 +5907,10 @@ int md_run(struct mddev *mddev)
if (rdev < rdev2 && if (rdev < rdev2 &&
rdev->bdev->bd_disk == rdev->bdev->bd_disk ==
rdev2->bdev->bd_disk) { rdev2->bdev->bd_disk) {
pr_warn("%s: WARNING: %s appears to be on the same physical disk as %s.\n", pr_warn("%s: WARNING: %pg appears to be on the same physical disk as %pg.\n",
mdname(mddev), mdname(mddev),
bdevname(rdev->bdev,b), rdev->bdev,
bdevname(rdev2->bdev,b2)); rdev2->bdev);
warned = 1; warned = 1;
} }
} }
@ -6452,8 +6438,7 @@ static void autorun_array(struct mddev *mddev)
pr_info("md: running: "); pr_info("md: running: ");
rdev_for_each(rdev, mddev) { rdev_for_each(rdev, mddev) {
char b[BDEVNAME_SIZE]; pr_cont("<%pg>", rdev->bdev);
pr_cont("<%s>", bdevname(rdev->bdev,b));
} }
pr_cont("\n"); pr_cont("\n");
@ -6480,7 +6465,6 @@ static void autorun_devices(int part)
{ {
struct md_rdev *rdev0, *rdev, *tmp; struct md_rdev *rdev0, *rdev, *tmp;
struct mddev *mddev; struct mddev *mddev;
char b[BDEVNAME_SIZE];
pr_info("md: autorun ...\n"); pr_info("md: autorun ...\n");
while (!list_empty(&pending_raid_disks)) { while (!list_empty(&pending_raid_disks)) {
@ -6490,12 +6474,12 @@ static void autorun_devices(int part)
rdev0 = list_entry(pending_raid_disks.next, rdev0 = list_entry(pending_raid_disks.next,
struct md_rdev, same_set); struct md_rdev, same_set);
pr_debug("md: considering %s ...\n", bdevname(rdev0->bdev,b)); pr_debug("md: considering %pg ...\n", rdev0->bdev);
INIT_LIST_HEAD(&candidates); INIT_LIST_HEAD(&candidates);
rdev_for_each_list(rdev, tmp, &pending_raid_disks) rdev_for_each_list(rdev, tmp, &pending_raid_disks)
if (super_90_load(rdev, rdev0, 0) >= 0) { if (super_90_load(rdev, rdev0, 0) >= 0) {
pr_debug("md: adding %s ...\n", pr_debug("md: adding %pg ...\n",
bdevname(rdev->bdev,b)); rdev->bdev);
list_move(&rdev->same_set, &candidates); list_move(&rdev->same_set, &candidates);
} }
/* /*
@ -6512,8 +6496,8 @@ static void autorun_devices(int part)
unit = MINOR(dev); unit = MINOR(dev);
} }
if (rdev0->preferred_minor != unit) { if (rdev0->preferred_minor != unit) {
pr_warn("md: unit number in %s is bad: %d\n", pr_warn("md: unit number in %pg is bad: %d\n",
bdevname(rdev0->bdev, b), rdev0->preferred_minor); rdev0->bdev, rdev0->preferred_minor);
break; break;
} }
@ -6526,8 +6510,8 @@ static void autorun_devices(int part)
pr_warn("md: %s locked, cannot run\n", mdname(mddev)); pr_warn("md: %s locked, cannot run\n", mdname(mddev));
else if (mddev->raid_disks || mddev->major_version else if (mddev->raid_disks || mddev->major_version
|| !list_empty(&mddev->disks)) { || !list_empty(&mddev->disks)) {
pr_warn("md: %s already running, cannot run %s\n", pr_warn("md: %s already running, cannot run %pg\n",
mdname(mddev), bdevname(rdev0->bdev,b)); mdname(mddev), rdev0->bdev);
mddev_unlock(mddev); mddev_unlock(mddev);
} else { } else {
pr_debug("md: created %s\n", mdname(mddev)); pr_debug("md: created %s\n", mdname(mddev));
@ -6701,7 +6685,6 @@ static int get_disk_info(struct mddev *mddev, void __user * arg)
int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info) int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
{ {
char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
struct md_rdev *rdev; struct md_rdev *rdev;
dev_t dev = MKDEV(info->major,info->minor); dev_t dev = MKDEV(info->major,info->minor);
@ -6731,9 +6714,9 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
err = super_types[mddev->major_version] err = super_types[mddev->major_version]
.load_super(rdev, rdev0, mddev->minor_version); .load_super(rdev, rdev0, mddev->minor_version);
if (err < 0) { if (err < 0) {
pr_warn("md: %s has different UUID to %s\n", pr_warn("md: %pg has different UUID to %pg\n",
bdevname(rdev->bdev,b), rdev->bdev,
bdevname(rdev0->bdev,b2)); rdev0->bdev);
export_rdev(rdev); export_rdev(rdev);
return -EINVAL; return -EINVAL;
} }
@ -6908,7 +6891,6 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
static int hot_remove_disk(struct mddev *mddev, dev_t dev) static int hot_remove_disk(struct mddev *mddev, dev_t dev)
{ {
char b[BDEVNAME_SIZE];
struct md_rdev *rdev; struct md_rdev *rdev;
if (!mddev->pers) if (!mddev->pers)
@ -6943,14 +6925,13 @@ kick_rdev:
return 0; return 0;
busy: busy:
pr_debug("md: cannot remove active disk %s from %s ...\n", pr_debug("md: cannot remove active disk %pg from %s ...\n",
bdevname(rdev->bdev,b), mdname(mddev)); rdev->bdev, mdname(mddev));
return -EBUSY; return -EBUSY;
} }
static int hot_add_disk(struct mddev *mddev, dev_t dev) static int hot_add_disk(struct mddev *mddev, dev_t dev)
{ {
char b[BDEVNAME_SIZE];
int err; int err;
struct md_rdev *rdev; struct md_rdev *rdev;
@ -6983,8 +6964,8 @@ static int hot_add_disk(struct mddev *mddev, dev_t dev)
rdev->sectors = rdev->sb_start; rdev->sectors = rdev->sb_start;
if (test_bit(Faulty, &rdev->flags)) { if (test_bit(Faulty, &rdev->flags)) {
pr_warn("md: can not hot-add faulty %s disk to %s!\n", pr_warn("md: can not hot-add faulty %pg disk to %s!\n",
bdevname(rdev->bdev,b), mdname(mddev)); rdev->bdev, mdname(mddev));
err = -EINVAL; err = -EINVAL;
goto abort_export; goto abort_export;
} }
@ -7011,8 +6992,8 @@ static int hot_add_disk(struct mddev *mddev, dev_t dev)
* disable on the whole MD. * disable on the whole MD.
*/ */
if (!blk_queue_nowait(bdev_get_queue(rdev->bdev))) { if (!blk_queue_nowait(bdev_get_queue(rdev->bdev))) {
pr_info("%s: Disabling nowait because %s does not support nowait\n", pr_info("%s: Disabling nowait because %pg does not support nowait\n",
mdname(mddev), bdevname(rdev->bdev, b)); mdname(mddev), rdev->bdev);
blk_queue_flag_clear(QUEUE_FLAG_NOWAIT, mddev->queue); blk_queue_flag_clear(QUEUE_FLAG_NOWAIT, mddev->queue);
} }
/* /*
@ -8017,10 +7998,8 @@ static void status_unused(struct seq_file *seq)
seq_printf(seq, "unused devices: "); seq_printf(seq, "unused devices: ");
list_for_each_entry(rdev, &pending_raid_disks, same_set) { list_for_each_entry(rdev, &pending_raid_disks, same_set) {
char b[BDEVNAME_SIZE];
i++; i++;
seq_printf(seq, "%s ", seq_printf(seq, "%pg ", rdev->bdev);
bdevname(rdev->bdev,b));
} }
if (!i) if (!i)
seq_printf(seq, "<none>"); seq_printf(seq, "<none>");
@ -8260,9 +8239,8 @@ static int md_seq_show(struct seq_file *seq, void *v)
sectors = 0; sectors = 0;
rcu_read_lock(); rcu_read_lock();
rdev_for_each_rcu(rdev, mddev) { rdev_for_each_rcu(rdev, mddev) {
char b[BDEVNAME_SIZE]; seq_printf(seq, " %pg[%d]", rdev->bdev, rdev->desc_nr);
seq_printf(seq, " %s[%d]",
bdevname(rdev->bdev,b), rdev->desc_nr);
if (test_bit(WriteMostly, &rdev->flags)) if (test_bit(WriteMostly, &rdev->flags))
seq_printf(seq, "(W)"); seq_printf(seq, "(W)");
if (test_bit(Journal, &rdev->flags)) if (test_bit(Journal, &rdev->flags))
@ -9661,7 +9639,6 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev)
struct mdp_superblock_1 *sb = page_address(rdev->sb_page); struct mdp_superblock_1 *sb = page_address(rdev->sb_page);
struct md_rdev *rdev2, *tmp; struct md_rdev *rdev2, *tmp;
int role, ret; int role, ret;
char b[BDEVNAME_SIZE];
/* /*
* If size is changed in another node then we need to * If size is changed in another node then we need to
@ -9685,7 +9662,8 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev)
if (test_bit(Candidate, &rdev2->flags)) { if (test_bit(Candidate, &rdev2->flags)) {
if (role == MD_DISK_ROLE_FAULTY) { if (role == MD_DISK_ROLE_FAULTY) {
pr_info("md: Removing Candidate device %s because add failed\n", bdevname(rdev2->bdev,b)); pr_info("md: Removing Candidate device %pg because add failed\n",
rdev2->bdev);
md_kick_rdev_from_array(rdev2); md_kick_rdev_from_array(rdev2);
continue; continue;
} }
@ -9702,8 +9680,8 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev)
MD_FEATURE_RESHAPE_ACTIVE)) { MD_FEATURE_RESHAPE_ACTIVE)) {
rdev2->saved_raid_disk = role; rdev2->saved_raid_disk = role;
ret = remove_and_add_spares(mddev, rdev2); ret = remove_and_add_spares(mddev, rdev2);
pr_info("Activated spare: %s\n", pr_info("Activated spare: %pg\n",
bdevname(rdev2->bdev,b)); rdev2->bdev);
/* wakeup mddev->thread here, so array could /* wakeup mddev->thread here, so array could
* perform resync with the new activated disk */ * perform resync with the new activated disk */
set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);

28
drivers/md/raid0.c
View file

@ -37,7 +37,6 @@ static void dump_zones(struct mddev *mddev)
int j, k; int j, k;
sector_t zone_size = 0; sector_t zone_size = 0;
sector_t zone_start = 0; sector_t zone_start = 0;
char b[BDEVNAME_SIZE];
struct r0conf *conf = mddev->private; struct r0conf *conf = mddev->private;
int raid_disks = conf->strip_zone[0].nb_dev; int raid_disks = conf->strip_zone[0].nb_dev;
pr_debug("md: RAID0 configuration for %s - %d zone%s\n", pr_debug("md: RAID0 configuration for %s - %d zone%s\n",
@ -48,9 +47,8 @@ static void dump_zones(struct mddev *mddev)
int len = 0; int len = 0;
for (k = 0; k < conf->strip_zone[j].nb_dev; k++) for (k = 0; k < conf->strip_zone[j].nb_dev; k++)
len += snprintf(line+len, 200-len, "%s%s", k?"/":"", len += snprintf(line+len, 200-len, "%s%pg", k?"/":"",
bdevname(conf->devlist[j*raid_disks conf->devlist[j * raid_disks + k]->bdev);
+ k]->bdev, b));
pr_debug("md: zone%d=[%s]\n", j, line); pr_debug("md: zone%d=[%s]\n", j, line);
zone_size = conf->strip_zone[j].zone_end - zone_start; zone_size = conf->strip_zone[j].zone_end - zone_start;
@ -69,8 +67,6 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
struct md_rdev *smallest, *rdev1, *rdev2, *rdev, **dev; struct md_rdev *smallest, *rdev1, *rdev2, *rdev, **dev;
struct strip_zone *zone; struct strip_zone *zone;
int cnt; int cnt;
char b[BDEVNAME_SIZE];
char b2[BDEVNAME_SIZE];
struct r0conf *conf = kzalloc(sizeof(*conf), GFP_KERNEL); struct r0conf *conf = kzalloc(sizeof(*conf), GFP_KERNEL);
unsigned blksize = 512; unsigned blksize = 512;
@ -78,9 +74,9 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
if (!conf) if (!conf)
return -ENOMEM; return -ENOMEM;
rdev_for_each(rdev1, mddev) { rdev_for_each(rdev1, mddev) {
pr_debug("md/raid0:%s: looking at %s\n", pr_debug("md/raid0:%s: looking at %pg\n",
mdname(mddev), mdname(mddev),
bdevname(rdev1->bdev, b)); rdev1->bdev);
c = 0; c = 0;
/* round size to chunk_size */ /* round size to chunk_size */
@ -92,12 +88,12 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
rdev1->bdev->bd_disk->queue)); rdev1->bdev->bd_disk->queue));
rdev_for_each(rdev2, mddev) { rdev_for_each(rdev2, mddev) {
pr_debug("md/raid0:%s: comparing %s(%llu)" pr_debug("md/raid0:%s: comparing %pg(%llu)"
" with %s(%llu)\n", " with %pg(%llu)\n",
mdname(mddev), mdname(mddev),
bdevname(rdev1->bdev,b), rdev1->bdev,
(unsigned long long)rdev1->sectors, (unsigned long long)rdev1->sectors,
bdevname(rdev2->bdev,b2), rdev2->bdev,
(unsigned long long)rdev2->sectors); (unsigned long long)rdev2->sectors);
if (rdev2 == rdev1) { if (rdev2 == rdev1) {
pr_debug("md/raid0:%s: END\n", pr_debug("md/raid0:%s: END\n",
@ -225,15 +221,15 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
for (j=0; j<cnt; j++) { for (j=0; j<cnt; j++) {
rdev = conf->devlist[j]; rdev = conf->devlist[j];
if (rdev->sectors <= zone->dev_start) { if (rdev->sectors <= zone->dev_start) {
pr_debug("md/raid0:%s: checking %s ... nope\n", pr_debug("md/raid0:%s: checking %pg ... nope\n",
mdname(mddev), mdname(mddev),
bdevname(rdev->bdev, b)); rdev->bdev);
continue; continue;
} }
pr_debug("md/raid0:%s: checking %s ..." pr_debug("md/raid0:%s: checking %pg ..."
" contained as device %d\n", " contained as device %d\n",
mdname(mddev), mdname(mddev),
bdevname(rdev->bdev, b), c); rdev->bdev, c);
dev[c] = rdev; dev[c] = rdev;
c++; c++;
if (!smallest || rdev->sectors < smallest->sectors) { if (!smallest || rdev->sectors < smallest->sectors) {

24
drivers/md/raid1.c
View file

@ -402,10 +402,9 @@ static void raid1_end_read_request(struct bio *bio)
/* /*
* oops, read error: * oops, read error:
*/ */
char b[BDEVNAME_SIZE]; pr_err_ratelimited("md/raid1:%s: %pg: rescheduling sector %llu\n",
pr_err_ratelimited("md/raid1:%s: %s: rescheduling sector %llu\n",
mdname(conf->mddev), mdname(conf->mddev),
bdevname(rdev->bdev, b), rdev->bdev,
(unsigned long long)r1_bio->sector); (unsigned long long)r1_bio->sector);
set_bit(R1BIO_ReadError, &r1_bio->state); set_bit(R1BIO_ReadError, &r1_bio->state);
reschedule_retry(r1_bio); reschedule_retry(r1_bio);
@ -1283,10 +1282,10 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
mirror = conf->mirrors + rdisk; mirror = conf->mirrors + rdisk;
if (r1bio_existed) if (r1bio_existed)
pr_info_ratelimited("md/raid1:%s: redirecting sector %llu to other mirror: %s\n", pr_info_ratelimited("md/raid1:%s: redirecting sector %llu to other mirror: %pg\n",
mdname(mddev), mdname(mddev),
(unsigned long long)r1_bio->sector, (unsigned long long)r1_bio->sector,
bdevname(mirror->rdev->bdev, b)); mirror->rdev->bdev);
if (test_bit(WriteMostly, &mirror->rdev->flags) && if (test_bit(WriteMostly, &mirror->rdev->flags) &&
bitmap) { bitmap) {
@ -1659,7 +1658,6 @@ static void raid1_status(struct seq_file *seq, struct mddev *mddev)
*/ */
static void raid1_error(struct mddev *mddev, struct md_rdev *rdev) static void raid1_error(struct mddev *mddev, struct md_rdev *rdev)
{ {
char b[BDEVNAME_SIZE];
struct r1conf *conf = mddev->private; struct r1conf *conf = mddev->private;
unsigned long flags; unsigned long flags;
@ -1686,9 +1684,9 @@ static void raid1_error(struct mddev *mddev, struct md_rdev *rdev)
set_bit(MD_RECOVERY_INTR, &mddev->recovery); set_bit(MD_RECOVERY_INTR, &mddev->recovery);
set_mask_bits(&mddev->sb_flags, 0, set_mask_bits(&mddev->sb_flags, 0,
BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING)); BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING));
pr_crit("md/raid1:%s: Disk failure on %s, disabling device.\n" pr_crit("md/raid1:%s: Disk failure on %pg, disabling device.\n"
"md/raid1:%s: Operation continuing on %d devices.\n", "md/raid1:%s: Operation continuing on %d devices.\n",
mdname(mddev), bdevname(rdev->bdev, b), mdname(mddev), rdev->bdev,
mdname(mddev), conf->raid_disks - mddev->degraded); mdname(mddev), conf->raid_disks - mddev->degraded);
} }
@ -1706,13 +1704,12 @@ static void print_conf(struct r1conf *conf)
rcu_read_lock(); rcu_read_lock();
for (i = 0; i < conf->raid_disks; i++) { for (i = 0; i < conf->raid_disks; i++) {
char b[BDEVNAME_SIZE];
struct md_rdev *rdev = rcu_dereference(conf->mirrors[i].rdev); struct md_rdev *rdev = rcu_dereference(conf->mirrors[i].rdev);
if (rdev) if (rdev)
pr_debug(" disk %d, wo:%d, o:%d, dev:%s\n", pr_debug(" disk %d, wo:%d, o:%d, dev:%pg\n",
i, !test_bit(In_sync, &rdev->flags), i, !test_bit(In_sync, &rdev->flags),
!test_bit(Faulty, &rdev->flags), !test_bit(Faulty, &rdev->flags),
bdevname(rdev->bdev,b)); rdev->bdev);
} }
rcu_read_unlock(); rcu_read_unlock();
} }
@ -2347,7 +2344,6 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
} }
d = start; d = start;
while (d != read_disk) { while (d != read_disk) {
char b[BDEVNAME_SIZE];
if (d==0) if (d==0)
d = conf->raid_disks * 2; d = conf->raid_disks * 2;
d--; d--;
@ -2360,11 +2356,11 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
if (r1_sync_page_io(rdev, sect, s, if (r1_sync_page_io(rdev, sect, s,
conf->tmppage, READ)) { conf->tmppage, READ)) {
atomic_add(s, &rdev->corrected_errors); atomic_add(s, &rdev->corrected_errors);
pr_info("md/raid1:%s: read error corrected (%d sectors at %llu on %s)\n", pr_info("md/raid1:%s: read error corrected (%d sectors at %llu on %pg)\n",
mdname(mddev), s, mdname(mddev), s,
(unsigned long long)(sect + (unsigned long long)(sect +
rdev->data_offset), rdev->data_offset),
bdevname(rdev->bdev, b)); rdev->bdev);
} }
rdev_dec_pending(rdev, mddev); rdev_dec_pending(rdev, mddev);
} else } else

54
drivers/md/raid10.c
View file

@ -397,10 +397,9 @@ static void raid10_end_read_request(struct bio *bio)
/* /*
* oops, read error - keep the refcount on the rdev * oops, read error - keep the refcount on the rdev
*/ */
char b[BDEVNAME_SIZE]; pr_err_ratelimited("md/raid10:%s: %pg: rescheduling sector %llu\n",
pr_err_ratelimited("md/raid10:%s: %s: rescheduling sector %llu\n",
mdname(conf->mddev), mdname(conf->mddev),
bdevname(rdev->bdev, b), rdev->bdev,
(unsigned long long)r10_bio->sector); (unsigned long long)r10_bio->sector);
set_bit(R10BIO_ReadError, &r10_bio->state); set_bit(R10BIO_ReadError, &r10_bio->state);
reschedule_retry(r10_bio); reschedule_retry(r10_bio);
@ -1187,9 +1186,9 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio,
return; return;
} }
if (err_rdev) if (err_rdev)
pr_err_ratelimited("md/raid10:%s: %s: redirecting sector %llu to another mirror\n", pr_err_ratelimited("md/raid10:%s: %pg: redirecting sector %llu to another mirror\n",
mdname(mddev), mdname(mddev),
bdevname(rdev->bdev, b), rdev->bdev,
(unsigned long long)r10_bio->sector); (unsigned long long)r10_bio->sector);
if (max_sectors < bio_sectors(bio)) { if (max_sectors < bio_sectors(bio)) {
struct bio *split = bio_split(bio, max_sectors, struct bio *split = bio_split(bio, max_sectors,
@ -1987,7 +1986,6 @@ static int enough(struct r10conf *conf, int ignore)
*/ */
static void raid10_error(struct mddev *mddev, struct md_rdev *rdev) static void raid10_error(struct mddev *mddev, struct md_rdev *rdev)
{ {
char b[BDEVNAME_SIZE];
struct r10conf *conf = mddev->private; struct r10conf *conf = mddev->private;
unsigned long flags; unsigned long flags;
@ -2010,9 +2008,9 @@ static void raid10_error(struct mddev *mddev, struct md_rdev *rdev)
set_mask_bits(&mddev->sb_flags, 0, set_mask_bits(&mddev->sb_flags, 0,
BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING)); BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING));
spin_unlock_irqrestore(&conf->device_lock, flags); spin_unlock_irqrestore(&conf->device_lock, flags);
pr_crit("md/raid10:%s: Disk failure on %s, disabling device.\n" pr_crit("md/raid10:%s: Disk failure on %pg, disabling device.\n"
"md/raid10:%s: Operation continuing on %d devices.\n", "md/raid10:%s: Operation continuing on %d devices.\n",
mdname(mddev), bdevname(rdev->bdev, b), mdname(mddev), rdev->bdev,
mdname(mddev), conf->geo.raid_disks - mddev->degraded); mdname(mddev), conf->geo.raid_disks - mddev->degraded);
} }
@ -2032,13 +2030,12 @@ static void print_conf(struct r10conf *conf)
/* This is only called with ->reconfix_mutex held, so /* This is only called with ->reconfix_mutex held, so
* rcu protection of rdev is not needed */ * rcu protection of rdev is not needed */
for (i = 0; i < conf->geo.raid_disks; i++) { for (i = 0; i < conf->geo.raid_disks; i++) {
char b[BDEVNAME_SIZE];
rdev = conf->mirrors[i].rdev; rdev = conf->mirrors[i].rdev;
if (rdev) if (rdev)
pr_debug(" disk %d, wo:%d, o:%d, dev:%s\n", pr_debug(" disk %d, wo:%d, o:%d, dev:%pg\n",
i, !test_bit(In_sync, &rdev->flags), i, !test_bit(In_sync, &rdev->flags),
!test_bit(Faulty, &rdev->flags), !test_bit(Faulty, &rdev->flags),
bdevname(rdev->bdev,b)); rdev->bdev);
} }
} }
@ -2691,14 +2688,11 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
check_decay_read_errors(mddev, rdev); check_decay_read_errors(mddev, rdev);
atomic_inc(&rdev->read_errors); atomic_inc(&rdev->read_errors);
if (atomic_read(&rdev->read_errors) > max_read_errors) { if (atomic_read(&rdev->read_errors) > max_read_errors) {
char b[BDEVNAME_SIZE]; pr_notice("md/raid10:%s: %pg: Raid device exceeded read_error threshold [cur %d:max %d]\n",
bdevname(rdev->bdev, b); mdname(mddev), rdev->bdev,
pr_notice("md/raid10:%s: %s: Raid device exceeded read_error threshold [cur %d:max %d]\n",
mdname(mddev), b,
atomic_read(&rdev->read_errors), max_read_errors); atomic_read(&rdev->read_errors), max_read_errors);
pr_notice("md/raid10:%s: %s: Failing raid device\n", pr_notice("md/raid10:%s: %pg: Failing raid device\n",
mdname(mddev), b); mdname(mddev), rdev->bdev);
md_error(mddev, rdev); md_error(mddev, rdev);
r10_bio->devs[r10_bio->read_slot].bio = IO_BLOCKED; r10_bio->devs[r10_bio->read_slot].bio = IO_BLOCKED;
return; return;
@ -2768,8 +2762,6 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
/* write it back and re-read */ /* write it back and re-read */
rcu_read_lock(); rcu_read_lock();
while (sl != r10_bio->read_slot) { while (sl != r10_bio->read_slot) {
char b[BDEVNAME_SIZE];
if (sl==0) if (sl==0)
sl = conf->copies; sl = conf->copies;
sl--; sl--;
@ -2788,24 +2780,22 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
s, conf->tmppage, WRITE) s, conf->tmppage, WRITE)
== 0) { == 0) {
/* Well, this device is dead */ /* Well, this device is dead */
pr_notice("md/raid10:%s: read correction write failed (%d sectors at %llu on %s)\n", pr_notice("md/raid10:%s: read correction write failed (%d sectors at %llu on %pg)\n",
mdname(mddev), s, mdname(mddev), s,
(unsigned long long)( (unsigned long long)(
sect + sect +
choose_data_offset(r10_bio, choose_data_offset(r10_bio,
rdev)), rdev)),
bdevname(rdev->bdev, b)); rdev->bdev);
pr_notice("md/raid10:%s: %s: failing drive\n", pr_notice("md/raid10:%s: %pg: failing drive\n",
mdname(mddev), mdname(mddev),
bdevname(rdev->bdev, b)); rdev->bdev);
} }
rdev_dec_pending(rdev, mddev); rdev_dec_pending(rdev, mddev);
rcu_read_lock(); rcu_read_lock();
} }
sl = start; sl = start;
while (sl != r10_bio->read_slot) { while (sl != r10_bio->read_slot) {
char b[BDEVNAME_SIZE];
if (sl==0) if (sl==0)
sl = conf->copies; sl = conf->copies;
sl--; sl--;
@ -2825,23 +2815,23 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
READ)) { READ)) {
case 0: case 0:
/* Well, this device is dead */ /* Well, this device is dead */
pr_notice("md/raid10:%s: unable to read back corrected sectors (%d sectors at %llu on %s)\n", pr_notice("md/raid10:%s: unable to read back corrected sectors (%d sectors at %llu on %pg)\n",
mdname(mddev), s, mdname(mddev), s,
(unsigned long long)( (unsigned long long)(
sect + sect +
choose_data_offset(r10_bio, rdev)), choose_data_offset(r10_bio, rdev)),
bdevname(rdev->bdev, b)); rdev->bdev);
pr_notice("md/raid10:%s: %s: failing drive\n", pr_notice("md/raid10:%s: %pg: failing drive\n",
mdname(mddev), mdname(mddev),
bdevname(rdev->bdev, b)); rdev->bdev);
break; break;
case 1: case 1:
pr_info("md/raid10:%s: read error corrected (%d sectors at %llu on %s)\n", pr_info("md/raid10:%s: read error corrected (%d sectors at %llu on %pg)\n",
mdname(mddev), s, mdname(mddev), s,
(unsigned long long)( (unsigned long long)(
sect + sect +
choose_data_offset(r10_bio, rdev)), choose_data_offset(r10_bio, rdev)),
bdevname(rdev->bdev, b)); rdev->bdev);
atomic_add(s, &rdev->corrected_errors); atomic_add(s, &rdev->corrected_errors);
} }

5
drivers/md/raid5-cache.c
View file

@ -3064,11 +3064,10 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
{ {
struct request_queue *q = bdev_get_queue(rdev->bdev); struct request_queue *q = bdev_get_queue(rdev->bdev);
struct r5l_log *log; struct r5l_log *log;
char b[BDEVNAME_SIZE];
int ret; int ret;
pr_debug("md/raid:%s: using device %s as journal\n", pr_debug("md/raid:%s: using device %pg as journal\n",
mdname(conf->mddev), bdevname(rdev->bdev, b)); mdname(conf->mddev), rdev->bdev);
if (PAGE_SIZE != 4096) if (PAGE_SIZE != 4096)
return -EINVAL; return -EINVAL;

27
drivers/md/raid5-ppl.c
View file

@ -798,7 +798,6 @@ static int ppl_recover_entry(struct ppl_log *log, struct ppl_header_entry *e,
int data_disks; int data_disks;
int i; int i;
int ret = 0; int ret = 0;
char b[BDEVNAME_SIZE];
unsigned int pp_size = le32_to_cpu(e->pp_size); unsigned int pp_size = le32_to_cpu(e->pp_size);
unsigned int data_size = le32_to_cpu(e->data_size); unsigned int data_size = le32_to_cpu(e->data_size);
@ -894,8 +893,8 @@ static int ppl_recover_entry(struct ppl_log *log, struct ppl_header_entry *e,
break; break;
} }
pr_debug("%s:%*s reading data member disk %s sector %llu\n", pr_debug("%s:%*s reading data member disk %pg sector %llu\n",
__func__, indent, "", bdevname(rdev->bdev, b), __func__, indent, "", rdev->bdev,
(unsigned long long)sector); (unsigned long long)sector);
if (!sync_page_io(rdev, sector, block_size, page2, if (!sync_page_io(rdev, sector, block_size, page2,
REQ_OP_READ, 0, false)) { REQ_OP_READ, 0, false)) {
@ -942,10 +941,10 @@ static int ppl_recover_entry(struct ppl_log *log, struct ppl_header_entry *e,
conf->disks[sh.pd_idx].rdev, 1); conf->disks[sh.pd_idx].rdev, 1);
BUG_ON(parity_rdev->bdev->bd_dev != log->rdev->bdev->bd_dev); BUG_ON(parity_rdev->bdev->bd_dev != log->rdev->bdev->bd_dev);
pr_debug("%s:%*s write parity at sector %llu, disk %s\n", pr_debug("%s:%*s write parity at sector %llu, disk %pg\n",
__func__, indent, "", __func__, indent, "",
(unsigned long long)parity_sector, (unsigned long long)parity_sector,
bdevname(parity_rdev->bdev, b)); parity_rdev->bdev);
if (!sync_page_io(parity_rdev, parity_sector, block_size, if (!sync_page_io(parity_rdev, parity_sector, block_size,
page1, REQ_OP_WRITE, 0, false)) { page1, REQ_OP_WRITE, 0, false)) {
pr_debug("%s:%*s parity write error!\n", __func__, pr_debug("%s:%*s parity write error!\n", __func__,
@ -1255,7 +1254,6 @@ void ppl_exit_log(struct r5conf *conf)
static int ppl_validate_rdev(struct md_rdev *rdev) static int ppl_validate_rdev(struct md_rdev *rdev)
{ {
char b[BDEVNAME_SIZE];
int ppl_data_sectors; int ppl_data_sectors;
int ppl_size_new; int ppl_size_new;
@ -1272,8 +1270,8 @@ static int ppl_validate_rdev(struct md_rdev *rdev)
RAID5_STRIPE_SECTORS((struct r5conf *)rdev->mddev->private)); RAID5_STRIPE_SECTORS((struct r5conf *)rdev->mddev->private));
if (ppl_data_sectors <= 0) { if (ppl_data_sectors <= 0) {
pr_warn("md/raid:%s: PPL space too small on %s\n", pr_warn("md/raid:%s: PPL space too small on %pg\n",
mdname(rdev->mddev), bdevname(rdev->bdev, b)); mdname(rdev->mddev), rdev->bdev);
return -ENOSPC; return -ENOSPC;
} }
@ -1283,16 +1281,16 @@ static int ppl_validate_rdev(struct md_rdev *rdev)
rdev->ppl.sector + ppl_size_new > rdev->data_offset) || rdev->ppl.sector + ppl_size_new > rdev->data_offset) ||
(rdev->ppl.sector >= rdev->data_offset && (rdev->ppl.sector >= rdev->data_offset &&
rdev->data_offset + rdev->sectors > rdev->ppl.sector)) { rdev->data_offset + rdev->sectors > rdev->ppl.sector)) {
pr_warn("md/raid:%s: PPL space overlaps with data on %s\n", pr_warn("md/raid:%s: PPL space overlaps with data on %pg\n",
mdname(rdev->mddev), bdevname(rdev->bdev, b)); mdname(rdev->mddev), rdev->bdev);
return -EINVAL; return -EINVAL;
} }
if (!rdev->mddev->external && if (!rdev->mddev->external &&
((rdev->ppl.offset > 0 && rdev->ppl.offset < (rdev->sb_size >> 9)) || ((rdev->ppl.offset > 0 && rdev->ppl.offset < (rdev->sb_size >> 9)) ||
(rdev->ppl.offset <= 0 && rdev->ppl.offset + ppl_size_new > 0))) { (rdev->ppl.offset <= 0 && rdev->ppl.offset + ppl_size_new > 0))) {
pr_warn("md/raid:%s: PPL space overlaps with superblock on %s\n", pr_warn("md/raid:%s: PPL space overlaps with superblock on %pg\n",
mdname(rdev->mddev), bdevname(rdev->bdev, b)); mdname(rdev->mddev), rdev->bdev);
return -EINVAL; return -EINVAL;
} }
@ -1463,14 +1461,13 @@ int ppl_modify_log(struct r5conf *conf, struct md_rdev *rdev, bool add)
struct ppl_conf *ppl_conf = conf->log_private; struct ppl_conf *ppl_conf = conf->log_private;
struct ppl_log *log; struct ppl_log *log;
int ret = 0; int ret = 0;
char b[BDEVNAME_SIZE];
if (!rdev) if (!rdev)
return -EINVAL; return -EINVAL;
pr_debug("%s: disk: %d operation: %s dev: %s\n", pr_debug("%s: disk: %d operation: %s dev: %pg\n",
__func__, rdev->raid_disk, add ? "add" : "remove", __func__, rdev->raid_disk, add ? "add" : "remove",
bdevname(rdev->bdev, b)); rdev->bdev);
if (rdev->raid_disk < 0) if (rdev->raid_disk < 0)
return 0; return 0;

37
drivers/md/raid5.c
View file

@ -2686,7 +2686,6 @@ static void raid5_end_read_request(struct bio * bi)
struct stripe_head *sh = bi->bi_private; struct stripe_head *sh = bi->bi_private;
struct r5conf *conf = sh->raid_conf; struct r5conf *conf = sh->raid_conf;
int disks = sh->disks, i; int disks = sh->disks, i;
char b[BDEVNAME_SIZE];
struct md_rdev *rdev = NULL; struct md_rdev *rdev = NULL;
sector_t s; sector_t s;
@ -2723,10 +2722,10 @@ static void raid5_end_read_request(struct bio * bi)
* any error * any error
*/ */
pr_info_ratelimited( pr_info_ratelimited(
"md/raid:%s: read error corrected (%lu sectors at %llu on %s)\n", "md/raid:%s: read error corrected (%lu sectors at %llu on %pg)\n",
mdname(conf->mddev), RAID5_STRIPE_SECTORS(conf), mdname(conf->mddev), RAID5_STRIPE_SECTORS(conf),
(unsigned long long)s, (unsigned long long)s,
bdevname(rdev->bdev, b)); rdev->bdev);
atomic_add(RAID5_STRIPE_SECTORS(conf), &rdev->corrected_errors); atomic_add(RAID5_STRIPE_SECTORS(conf), &rdev->corrected_errors);
clear_bit(R5_ReadError, &sh->dev[i].flags); clear_bit(R5_ReadError, &sh->dev[i].flags);
clear_bit(R5_ReWrite, &sh->dev[i].flags); clear_bit(R5_ReWrite, &sh->dev[i].flags);
@ -2743,7 +2742,6 @@ static void raid5_end_read_request(struct bio * bi)
if (atomic_read(&rdev->read_errors)) if (atomic_read(&rdev->read_errors))
atomic_set(&rdev->read_errors, 0); atomic_set(&rdev->read_errors, 0);
} else { } else {
const char *bdn = bdevname(rdev->bdev, b);
int retry = 0; int retry = 0;
int set_bad = 0; int set_bad = 0;
@ -2752,25 +2750,25 @@ static void raid5_end_read_request(struct bio * bi)
atomic_inc(&rdev->read_errors); atomic_inc(&rdev->read_errors);
if (test_bit(R5_ReadRepl, &sh->dev[i].flags)) if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
pr_warn_ratelimited( pr_warn_ratelimited(
"md/raid:%s: read error on replacement device (sector %llu on %s).\n", "md/raid:%s: read error on replacement device (sector %llu on %pg).\n",
mdname(conf->mddev), mdname(conf->mddev),
(unsigned long long)s, (unsigned long long)s,
bdn); rdev->bdev);
else if (conf->mddev->degraded >= conf->max_degraded) { else if (conf->mddev->degraded >= conf->max_degraded) {
set_bad = 1; set_bad = 1;
pr_warn_ratelimited( pr_warn_ratelimited(
"md/raid:%s: read error not correctable (sector %llu on %s).\n", "md/raid:%s: read error not correctable (sector %llu on %pg).\n",
mdname(conf->mddev), mdname(conf->mddev),
(unsigned long long)s, (unsigned long long)s,
bdn); rdev->bdev);
} else if (test_bit(R5_ReWrite, &sh->dev[i].flags)) { } else if (test_bit(R5_ReWrite, &sh->dev[i].flags)) {
/* Oh, no!!! */ /* Oh, no!!! */
set_bad = 1; set_bad = 1;
pr_warn_ratelimited( pr_warn_ratelimited(
"md/raid:%s: read error NOT corrected!! (sector %llu on %s).\n", "md/raid:%s: read error NOT corrected!! (sector %llu on %pg).\n",
mdname(conf->mddev), mdname(conf->mddev),
(unsigned long long)s, (unsigned long long)s,
bdn); rdev->bdev);
} else if (atomic_read(&rdev->read_errors) } else if (atomic_read(&rdev->read_errors)
> conf->max_nr_stripes) { > conf->max_nr_stripes) {
if (!test_bit(Faulty, &rdev->flags)) { if (!test_bit(Faulty, &rdev->flags)) {
@ -2778,8 +2776,8 @@ static void raid5_end_read_request(struct bio * bi)
mdname(conf->mddev), mdname(conf->mddev),
atomic_read(&rdev->read_errors), atomic_read(&rdev->read_errors),
conf->max_nr_stripes); conf->max_nr_stripes);
pr_warn("md/raid:%s: Too many read errors, failing device %s.\n", pr_warn("md/raid:%s: Too many read errors, failing device %pg.\n",
mdname(conf->mddev), bdn); mdname(conf->mddev), rdev->bdev);
} }
} else } else
retry = 1; retry = 1;
@ -2891,13 +2889,12 @@ static void raid5_end_write_request(struct bio *bi)
static void raid5_error(struct mddev *mddev, struct md_rdev *rdev) static void raid5_error(struct mddev *mddev, struct md_rdev *rdev)
{ {
char b[BDEVNAME_SIZE];
struct r5conf *conf = mddev->private; struct r5conf *conf = mddev->private;
unsigned long flags; unsigned long flags;
pr_debug("raid456: error called\n"); pr_debug("raid456: error called\n");
pr_crit("md/raid:%s: Disk failure on %s, disabling device.\n", pr_crit("md/raid:%s: Disk failure on %pg, disabling device.\n",
mdname(mddev), bdevname(rdev->bdev, b)); mdname(mddev), rdev->bdev);
spin_lock_irqsave(&conf->device_lock, flags); spin_lock_irqsave(&conf->device_lock, flags);
set_bit(Faulty, &rdev->flags); set_bit(Faulty, &rdev->flags);
@ -7359,9 +7356,8 @@ static struct r5conf *setup_conf(struct mddev *mddev)
} }
if (test_bit(In_sync, &rdev->flags)) { if (test_bit(In_sync, &rdev->flags)) {
char b[BDEVNAME_SIZE]; pr_info("md/raid:%s: device %pg operational as raid disk %d\n",
pr_info("md/raid:%s: device %s operational as raid disk %d\n", mdname(mddev), rdev->bdev, raid_disk);
mdname(mddev), bdevname(rdev->bdev, b), raid_disk);
} else if (rdev->saved_raid_disk != raid_disk) } else if (rdev->saved_raid_disk != raid_disk)
/* Cannot rely on bitmap to complete recovery */ /* Cannot rely on bitmap to complete recovery */
conf->fullsync = 1; conf->fullsync = 1;
@ -7877,12 +7873,11 @@ static void print_raid5_conf (struct r5conf *conf)
rcu_read_lock(); rcu_read_lock();
for (i = 0; i < conf->raid_disks; i++) { for (i = 0; i < conf->raid_disks; i++) {
char b[BDEVNAME_SIZE];
rdev = rcu_dereference(conf->disks[i].rdev); rdev = rcu_dereference(conf->disks[i].rdev);
if (rdev) if (rdev)
pr_debug(" disk %d, o:%d, dev:%s\n", pr_debug(" disk %d, o:%d, dev:%pg\n",
i, !test_bit(Faulty, &rdev->flags), i, !test_bit(Faulty, &rdev->flags),
bdevname(rdev->bdev, b)); rdev->bdev);
} }
rcu_read_unlock(); rcu_read_unlock();
} }