From: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
Signed-off-by: heinzm <heinzm@xxxxxxxxxx>
---
drivers/md/md-multipath.c | 2 +-
drivers/md/md.c | 4 ++--
drivers/md/raid5.c | 17 +++++++----------
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/drivers/md/md-multipath.c b/drivers/md/md-multipath.c
index 6cc169abef00..34fd6db61d79 100644
--- a/drivers/md/md-multipath.c
+++ b/drivers/md/md-multipath.c
@@ -45,7 +45,7 @@ static int multipath_map(struct mpconf *conf)
}
rcu_read_unlock();
- pr_crit_ratelimited("multipath_map(): no more operational IO paths?\n");
+ pr_crit_ratelimited("%s(): no more operational IO paths?\n", __func__);
return (-1);
}
diff --git a/drivers/md/md.c b/drivers/md/md.c
index a495fad762ae..6a4d01efaca5 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2487,7 +2487,7 @@ void md_autodetect_dev(dev_t dev);
static void export_rdev(struct md_rdev *rdev)
{
- pr_debug("md: export_rdev(%pg)\n", rdev->bdev);
+ pr_debug("md: %s(%pg)\n", __func__, rdev->bdev);
md_rdev_clear(rdev);
#ifndef MODULE
if (test_bit(AutoDetected, &rdev->flags))
@@ -2763,7 +2763,7 @@ void md_update_sb(struct mddev *mddev, int force_change)
mdname(mddev), mddev->in_sync);
if (mddev->queue)
- blk_add_trace_msg(mddev->queue, "md md_update_sb");
+ blk_add_trace_msg(mddev->queue, "md %s", __func__);
rewrite:
md_bitmap_update_sb(mddev->bitmap);
rdev_for_each(rdev, mddev) {
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index b41d0918b914..84e4eaa937cf 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -426,8 +426,7 @@ void raid5_release_stripe(struct stripe_head *sh)
static inline void remove_hash(struct stripe_head *sh)
{
- pr_debug("remove_hash(), stripe %llu\n",
- (unsigned long long)sh->sector);
+ pr_debug("%s(), stripe %llu\n", __func__, (unsigned long long)sh->sector);
hlist_del_init(&sh->hash);
}
@@ -436,8 +435,7 @@ static inline void insert_hash(struct r5conf *conf, struct stripe_head *sh)
{
struct hlist_head *hp = stripe_hash(conf, sh->sector);
- pr_debug("insert_hash(), stripe %llu\n",
- (unsigned long long)sh->sector);
+ pr_debug("%s(), stripe %llu\n", __func__, (unsigned long long)sh->sector);
hlist_add_head(&sh->hash, hp);
}
@@ -587,8 +585,7 @@ static void init_stripe(struct stripe_head *sh, sector_t sector, int previous)
BUG_ON(stripe_operations_active(sh));
BUG_ON(sh->batch_head);
- pr_debug("init_stripe called, stripe %llu\n",
- (unsigned long long)sector);
+ pr_debug("%s called, stripe %llu\n", __func__, (unsigned long long)sector);
retry:
seq = read_seqcount_begin(&conf->gen_lock);
sh->generation = conf->generation - previous;
@@ -624,7 +621,7 @@ static struct stripe_head *__find_stripe(struct r5conf *conf, sector_t sector,
{
struct stripe_head *sh;
- pr_debug("__find_stripe, sector %llu\n", (unsigned long long)sector);
+ pr_debug("%s, sector %llu\n", __func__, (unsigned long long)sector);
hlist_for_each_entry(sh, stripe_hash(conf, sector), hash)
if (sh->sector == sector && sh->generation == generation)
return sh;
@@ -5537,7 +5534,7 @@ static void raid5_align_endio(struct bio *bi)
return;
}
- pr_debug("raid5_align_endio : io error...handing IO for a retry\n");
+ pr_debug("%s : io error...handing IO for a retry\n", __func__);
add_bio_to_retry(raid_bi, conf);
}
@@ -6783,7 +6780,7 @@ static void raid5d(struct md_thread *thread)
int handled;
struct blk_plug plug;
- pr_debug("+++ raid5d active\n");
+ pr_debug("+++ %s active\n", __func__);
md_check_recovery(mddev);
@@ -6865,7 +6862,7 @@ static void raid5d(struct md_thread *thread)
async_tx_issue_pending_all();
blk_finish_plug(&plug);
- pr_debug("--- raid5d inactive\n");
+ pr_debug("--- %s inactive\n", __func__);
}
static ssize_t
--
2.39.2
