Commit 4f354560 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Jens Axboe
Browse files

md/raid5: Move read_seqcount_begin() into make_stripe_request() 



Now that prepare_to_wait() isn't in the way, move read_sequcount_begin()
into make_stripe_request().

No functional changes intended.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGuoqing Jiang <guoqing.jiang@linux.dev>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1cdb5b41

drivers/md/raid5.c

+5 −7
Original line number Diff line number Diff line
@@ -5801,14 +5801,16 @@ struct stripe_request_ctx { 


static enum stripe_result make_stripe_request(struct mddev *mddev,

		struct r5conf *conf, struct stripe_request_ctx *ctx,

		sector_t logical_sector, struct bio *bi, int seq)

		sector_t logical_sector, struct bio *bi)

{

	const int rw = bio_data_dir(bi);

	enum stripe_result ret;

	struct stripe_head *sh;

	sector_t new_sector;

	int previous = 0;

	int dd_idx;

	int seq, dd_idx;



	seq = read_seqcount_begin(&conf->gen_lock);



	if (unlikely(conf->reshape_progress != MaxSector)) {

		/*
@@ -5974,13 +5976,9 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi) 
	md_account_bio(mddev, &bi);

	prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE);

	for (; logical_sector < last_sector; logical_sector += RAID5_STRIPE_SECTORS(conf)) {

		int seq;



	retry:

		seq = read_seqcount_begin(&conf->gen_lock);



		res = make_stripe_request(mddev, conf, &ctx, logical_sector,

					  bi, seq);

					  bi);

		if (res == STRIPE_FAIL)

			break;