From: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
Signed-off-by: heinzm <heinzm@xxxxxxxxxx>
---
drivers/md/md-bitmap.c | 3 +--
drivers/md/md-cluster.c | 4 ++--
drivers/md/raid0.c | 6 ++----
drivers/md/raid1.c | 3 +--
drivers/md/raid10.c | 3 +--
drivers/md/raid5.c | 17 +++++++----------
6 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index dd752f04e3af..0ae7ab8244d7 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -2041,8 +2041,7 @@ void md_bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
counts = &bitmap->counts;
chunk_kb = bitmap->mddev->bitmap_info.chunksize >> 10;
- seq_printf(seq, "bitmap: %lu/%lu pages [%luKB], "
- "%lu%s chunk",
+ seq_printf(seq, "bitmap: %lu/%lu pages [%luKB], %lu%s chunk",
counts->pages - counts->missing_pages,
counts->pages,
(counts->pages - counts->missing_pages)
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index ac3a8afc28ee..c2d568194fb4 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -171,8 +171,8 @@ static int dlm_lock_sync_interruptible(struct dlm_lock_resource *res, int mode,
&res->lksb, res);
res->sync_locking_done = false;
if (unlikely(ret != 0))
- pr_info("failed to cancel previous lock request "
- "%s return %d\n", res->name, ret);
+ pr_info("failed to cancel previous lock request %s return %d\n",
+ res->name, ret);
return -EPERM;
}
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index cedb91f84b69..f8897ab4baeb 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -90,8 +90,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
rdev1->bdev->bd_disk->queue));
rdev_for_each(rdev2, mddev) {
- pr_debug("md/raid0:%s: comparing %pg(%llu)"
- " with %pg(%llu)\n",
+ pr_debug("md/raid0:%s: comparing %pg(%llu) with %pg(%llu)\n",
mdname(mddev),
rdev1->bdev,
(unsigned long long)rdev1->sectors,
@@ -227,8 +226,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
rdev->bdev);
continue;
}
- pr_debug("md/raid0:%s: checking %pg ..."
- " contained as device %d\n",
+ pr_debug("md/raid0:%s: checking %pg ... contained as device %d\n",
mdname(mddev),
rdev->bdev, c);
dev[c] = rdev;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 8097e01cd63b..2f8fba6e9756 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -544,8 +544,7 @@ static void raid1_end_write_request(struct bio *bio)
if (!test_and_set_bit(R1BIO_Returned, &r1_bio->state)) {
struct bio *mbio = r1_bio->master_bio;
- pr_debug("raid1: behind end write sectors"
- " %llu-%llu\n",
+ pr_debug("raid1: behind end write sectors %llu-%llu\n",
(unsigned long long) mbio->bi_iter.bi_sector,
(unsigned long long) bio_end_sector(mbio) - 1);
call_bio_endio(r1_bio);
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index a95609d5e79c..60d7b1af229e 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -4168,8 +4168,7 @@ static int raid10_run(struct mddev *mddev)
fc = (mddev->layout >> 8) & 255;
fo = mddev->layout & (1<<16);
if (fc > 1 || fo > 0) {
- pr_err("only near layout is supported by clustered"
- " raid10\n");
+ pr_err("only near layout is supported by clustered raid10\n");
goto out_free_conf;
}
}
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index fb6e0cf727a6..6b87481a9657 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1323,8 +1323,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
rbi->bi_end_io = raid5_end_write_request;
rbi->bi_private = sh;
- pr_debug("%s: for %llu schedule op %d on "
- "replacement disc %d\n",
+ pr_debug("%s: for %llu schedule op %d on replacement disc %d\n",
__func__, (unsigned long long)sh->sector,
rbi->bi_opf, i);
atomic_inc(&sh->count);
@@ -4335,8 +4334,7 @@ static int handle_stripe_dirtying(struct r5conf *conf,
if (test_bit(R5_Insync, &dev->flags) &&
test_bit(STRIPE_PREREAD_ACTIVE,
&sh->state)) {
- pr_debug("Read_old block "
- "%d for Reconstruct\n", i);
+ pr_debug("Read_old block %d for Reconstruct\n", i);
set_bit(R5_LOCKED, &dev->flags);
set_bit(R5_Wantread, &dev->flags);
s->locked++;
@@ -4438,8 +4436,8 @@ static void handle_parity_checks5(struct r5conf *conf, struct stripe_head *sh,
if (test_bit(MD_RECOVERY_CHECK, &conf->mddev->recovery)) {
/* don't try to repair!! */
set_bit(STRIPE_INSYNC, &sh->state);
- pr_warn_ratelimited("%s: mismatch sector in range "
- "%llu-%llu\n", mdname(conf->mddev),
+ pr_warn_ratelimited("%s: mismatch sector in range %llu-%llu\n",
+ mdname(conf->mddev),
(unsigned long long) sh->sector,
(unsigned long long) sh->sector +
RAID5_STRIPE_SECTORS(conf));
@@ -4603,8 +4601,8 @@ static void handle_parity_checks6(struct r5conf *conf, struct stripe_head *sh,
if (test_bit(MD_RECOVERY_CHECK, &conf->mddev->recovery)) {
/* don't try to repair!! */
set_bit(STRIPE_INSYNC, &sh->state);
- pr_warn_ratelimited("%s: mismatch sector in range "
- "%llu-%llu\n", mdname(conf->mddev),
+ pr_warn_ratelimited("%s: mismatch sector in range %llu-%llu\n",
+ mdname(conf->mddev),
(unsigned long long) sh->sector,
(unsigned long long) sh->sector +
RAID5_STRIPE_SECTORS(conf));
@@ -5094,8 +5092,7 @@ static void handle_stripe(struct stripe_head *sh)
set_bit(STRIPE_BIOFILL_RUN, &sh->state);
}
- pr_debug("locked=%d uptodate=%d to_read=%d"
- " to_write=%d failed=%d failed_num=%d,%d\n",
+ pr_debug("locked=%d uptodate=%d to_read=%d to_write=%d failed=%d failed_num=%d,%d\n",
s.locked, s.uptodate, s.to_read, s.to_write, s.failed,
s.failed_num[0], s.failed_num[1]);
/*
--
2.39.2
