Commit 59f8f0b5 authored by Li Nan's avatar Li Nan Committed by Song Liu
Browse files

md/raid10: improve code of mrdev in raid10_sync_request 



'need_recover' and 'mrdev' are equivalent in raid10_sync_request(), and
inc mrdev->nr_pending is unreasonable if don't need recovery. Replace
'need_recover' with 'mrdev', and only inc nr_pending when needed.

Signed-off-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230527072218.2365857-3-linan666@huaweicloud.com
parent 34817a24

drivers/md/raid10.c

+12 −11
Original line number Diff line number Diff line
@@ -3440,7 +3440,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
			sector_t sect;

			int must_sync;

			int any_working;

			int need_recover = 0;

			struct raid10_info *mirror = &conf->mirrors[i];

			struct md_rdev *mrdev, *mreplace;
@@ -3448,14 +3447,13 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
			mrdev = rcu_dereference(mirror->rdev);

			mreplace = rcu_dereference(mirror->replacement);



			if (mrdev != NULL &&

			    !test_bit(Faulty, &mrdev->flags) &&

			    !test_bit(In_sync, &mrdev->flags))

				need_recover = 1;

			if (mrdev && (test_bit(Faulty, &mrdev->flags) ||

			    test_bit(In_sync, &mrdev->flags)))

				mrdev = NULL;

			if (mreplace && test_bit(Faulty, &mreplace->flags))

				mreplace = NULL;



			if (!need_recover && !mreplace) {

			if (!mrdev && !mreplace) {

				rcu_read_unlock();

				continue;

			}
@@ -3489,6 +3487,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
				rcu_read_unlock();

				continue;

			}

			if (mrdev)

				atomic_inc(&mrdev->nr_pending);

			if (mreplace)

				atomic_inc(&mreplace->nr_pending);
@@ -3576,7 +3575,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
				r10_bio->devs[1].devnum = i;

				r10_bio->devs[1].addr = to_addr;



				if (need_recover) {

				if (mrdev) {

					bio = r10_bio->devs[1].bio;

					bio->bi_next = biolist;

					biolist = bio;
@@ -3621,7 +3620,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
					for (k = 0; k < conf->copies; k++)

						if (r10_bio->devs[k].devnum == i)

							break;

					if (!test_bit(In_sync,

					if (mrdev && !test_bit(In_sync,

						      &mrdev->flags)

					    && !rdev_set_badblocks(

						    mrdev,
@@ -3647,11 +3646,13 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
				if (rb2)

					atomic_dec(&rb2->remaining);

				r10_bio = rb2;

				if (mrdev)

					rdev_dec_pending(mrdev, mddev);

				if (mreplace)

					rdev_dec_pending(mreplace, mddev);

				break;

			}

			if (mrdev)

				rdev_dec_pending(mrdev, mddev);

			if (mreplace)

				rdev_dec_pending(mreplace, mddev);