Commit a433d721 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.9 

Pull MD fix from Song.

* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid5: make sure stripe_size as power of two
parents 79e5dc59 6af10a33

drivers/md/raid5.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -6514,9 +6514,12 @@ raid5_store_stripe_size(struct mddev *mddev, const char *page, size_t len) 




	/*

	/*

	 * The value should not be bigger than PAGE_SIZE. It requires to

	 * The value should not be bigger than PAGE_SIZE. It requires to

	 * be multiple of DEFAULT_STRIPE_SIZE.

	 * be multiple of DEFAULT_STRIPE_SIZE and the value should be power

	 * of two.

	 */

	 */

	if (new % DEFAULT_STRIPE_SIZE != 0 || new > PAGE_SIZE || new == 0)

	if (new % DEFAULT_STRIPE_SIZE != 0 ||

			new > PAGE_SIZE || new == 0 ||

			new != roundup_pow_of_two(new))

		return -EINVAL;

		return -EINVAL;





	err = mddev_lock(mddev);

	err = mddev_lock(mddev);