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

Commit 584ed9fa authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Shaohua Li
Browse files

md: raid10: remove VLAIS 



The raid10 driver can't be built with clang since it uses a variable
length array in a structure (VLAIS):

drivers/md/raid10.c:4583:17: error: fields must have a constant size:
  'variable length array in structure' extension will never be supported

Allocate the r10bio struct with kmalloc instead of using the VLAIS
construct.

Shaohua: set the MD_RECOVERY_INTR bit
Neil Brown: use GFP_NOIO

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 7a57157a

drivers/md/raid10.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -4578,15 +4578,18 @@ static int handle_reshape_read_error(struct mddev *mddev, 
	/* Use sync reads to get the blocks from somewhere else */

	/* Use sync reads to get the blocks from somewhere else */

	int sectors = r10_bio->sectors;

	int sectors = r10_bio->sectors;

	struct r10conf *conf = mddev->private;

	struct r10conf *conf = mddev->private;

	struct {

	struct r10bio *r10b;

		struct r10bio r10_bio;

		struct r10dev devs[conf->copies];

	} on_stack;

	struct r10bio *r10b = &on_stack.r10_bio;

	int slot = 0;

	int slot = 0;

	int idx = 0;

	int idx = 0;

	struct page **pages;

	struct page **pages;





	r10b = kmalloc(sizeof(*r10b) +

	       sizeof(struct r10dev) * conf->copies, GFP_NOIO);

	if (!r10b) {

		set_bit(MD_RECOVERY_INTR, &mddev->recovery);

		return -ENOMEM;

	}



	/* reshape IOs share pages from .devs[0].bio */

	/* reshape IOs share pages from .devs[0].bio */

	pages = get_resync_pages(r10_bio->devs[0].bio)->pages;

	pages = get_resync_pages(r10_bio->devs[0].bio)->pages;
@@ -4635,11 +4638,13 @@ static int handle_reshape_read_error(struct mddev *mddev, 
			/* couldn't read this block, must give up */

			/* couldn't read this block, must give up */

			set_bit(MD_RECOVERY_INTR,

			set_bit(MD_RECOVERY_INTR,

				&mddev->recovery);

				&mddev->recovery);

			kfree(r10b);

			return -EIO;

			return -EIO;

		}

		}

		sectors -= s;

		sectors -= s;

		idx++;

		idx++;

	}

	}

	kfree(r10b);

	return 0;

	return 0;

}

}