Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27a4ff8f authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Shaohua Li
Browse files

raid5: remove raid5_build_block 



Now raid5_build_block is just called to set the
sector of r5dev, raid5_compute_blocknr can be
used directly for the purpose.

Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent a72cbf83

drivers/md/raid5.c

+1 −10
Original line number Diff line number Diff line
@@ -494,7 +494,6 @@ static int grow_buffers(struct stripe_head *sh, gfp_t gfp) 
	return 0;

}



static void raid5_build_block(struct stripe_head *sh, int i, int previous);

static void stripe_set_idx(sector_t stripe, struct r5conf *conf, int previous,

			    struct stripe_head *sh);
@@ -530,7 +529,7 @@ static void init_stripe(struct stripe_head *sh, sector_t sector, int previous) 
			WARN_ON(1);

		}

		dev->flags = 0;

		raid5_build_block(sh, i, previous);

		dev->sector = raid5_compute_blocknr(sh, i, previous);

	}

	if (read_seqcount_retry(&conf->gen_lock, seq))

		goto retry;
@@ -2662,14 +2661,6 @@ static void raid5_end_write_request(struct bio *bi) 
		raid5_release_stripe(sh->batch_head);

}



static void raid5_build_block(struct stripe_head *sh, int i, int previous)

{

	struct r5dev *dev = &sh->dev[i];



	dev->flags = 0;

	dev->sector = raid5_compute_blocknr(sh, i, previous);

}



static void raid5_error(struct mddev *mddev, struct md_rdev *rdev)

{

	char b[BDEVNAME_SIZE];