md/raid1: rename print_msg with r1bio_existed
authorGuoqing Jiang <jgq516@gmail.com>
Tue, 25 May 2021 09:46:20 +0000 (17:46 +0800)
committerSong Liu <song@kernel.org>
Tue, 15 Jun 2021 05:32:06 +0000 (22:32 -0700)
The caller of raid1_read_request could pass NULL or a valid pointer for
"struct r1bio *r1_bio", so it actually means whether r1_bio is existed
or not.

Signed-off-by: Guoqing Jiang <jiangguoqing@kylinos.cn>
Signed-off-by: Song Liu <song@kernel.org>
drivers/md/raid1.c

index ced076ba560e18a7ac141d3ab8dc7f430ccbc1f4..696da6b8b7ed535ad84f406b792154e88f28b808 100644 (file)
@@ -1210,7 +1210,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
        const unsigned long do_sync = (bio->bi_opf & REQ_SYNC);
        int max_sectors;
        int rdisk;
-       bool print_msg = !!r1_bio;
+       bool r1bio_existed = !!r1_bio;
        char b[BDEVNAME_SIZE];
 
        /*
@@ -1220,7 +1220,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
         */
        gfp_t gfp = r1_bio ? (GFP_NOIO | __GFP_HIGH) : GFP_NOIO;
 
-       if (print_msg) {
+       if (r1bio_existed) {
                /* Need to get the block device name carefully */
                struct md_rdev *rdev;
                rcu_read_lock();
@@ -1252,7 +1252,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
 
        if (rdisk < 0) {
                /* couldn't find anywhere to read from */
-               if (print_msg) {
+               if (r1bio_existed) {
                        pr_crit_ratelimited("md/raid1:%s: %s: unrecoverable I/O read error for block %llu\n",
                                            mdname(mddev),
                                            b,
@@ -1263,7 +1263,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
        }
        mirror = conf->mirrors + rdisk;
 
-       if (print_msg)
+       if (r1bio_existed)
                pr_info_ratelimited("md/raid1:%s: redirecting sector %llu to other mirror: %s\n",
                                    mdname(mddev),
                                    (unsigned long long)r1_bio->sector,