Commit 8650a889 authored by Xiao Ni's avatar Xiao Ni Committed by Song Liu
Browse files

md/raid10: extend r10bio devs to raid disks 



Now it allocs r10bio->devs[conf->copies]. Discard bio needs to submit
to all member disks and it needs to use r10bio. So extend to
r10bio->devs[geo.raid_disks].

Reviewed-by: default avatarColy Li <colyli@suse.de>
Signed-off-by: default avatarXiao Ni <xni@redhat.com>
Signed-off-by: default avatarSong Liu <songliubraving@fb.com>
parent 2628089b

drivers/md/raid10.c

+4 −5
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static inline struct r10bio *get_resync_r10bio(struct bio *bio) 
static void * r10bio_pool_alloc(gfp_t gfp_flags, void *data)

{

	struct r10conf *conf = data;

	int size = offsetof(struct r10bio, devs[conf->copies]);

	int size = offsetof(struct r10bio, devs[conf->geo.raid_disks]);



	/* allocate a r10bio with room for raid_disks entries in the

	 * bios array */
@@ -238,7 +238,7 @@ static void put_all_bios(struct r10conf *conf, struct r10bio *r10_bio) 
{

	int i;



	for (i = 0; i < conf->copies; i++) {

	for (i = 0; i < conf->geo.raid_disks; i++) {

		struct bio **bio = & r10_bio->devs[i].bio;

		if (!BIO_SPECIAL(*bio))

			bio_put(*bio);
@@ -327,7 +327,7 @@ static int find_bio_disk(struct r10conf *conf, struct r10bio *r10_bio, 
	int slot;

	int repl = 0;



	for (slot = 0; slot < conf->copies; slot++) {

	for (slot = 0; slot < conf->geo.raid_disks; slot++) {

		if (r10_bio->devs[slot].bio == bio)

			break;

		if (r10_bio->devs[slot].repl_bio == bio) {
@@ -336,7 +336,6 @@ static int find_bio_disk(struct r10conf *conf, struct r10bio *r10_bio, 
		}

	}



	BUG_ON(slot == conf->copies);

	update_head_pos(slot, r10_bio);



	if (slotp)
@@ -1493,7 +1492,7 @@ static void __make_request(struct mddev *mddev, struct bio *bio, int sectors) 
	r10_bio->mddev = mddev;

	r10_bio->sector = bio->bi_iter.bi_sector;

	r10_bio->state = 0;

	memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->copies);

	memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->geo.raid_disks);



	if (bio_data_dir(bio) == READ)

		raid10_read_request(mddev, bio, r10_bio);

CRA Git | Maintained and supported by SUSTech CRA and CCSE