From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Jul 2017 19:50:18 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=026d15f6b9878794fae1f794cae881ccd65052e5;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-next' of git://git./linux/kernel/git/shli/md

Pull MD update from Shaohua Li:

 - fixed deadlock in MD suspend and a potential bug in bio allocation
   (Neil Brown)

 - fixed signal issue (Mikulas Patocka)

 - fixed typo in FailFast test (Guoqing Jiang)

 - other trival fixes

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
  MD: fix sleep in atomic
  MD: fix a null dereference
  md: use a separate bio_set for synchronous IO.
  md: change the initialization value for a spare device spot to MD_DISK_ROLE_SPARE
  md/raid1: remove unused bio in sync_request_write
  md/raid10: fix FailFast test for wrong device
  md: don't use flush_signals in userspace processes
  md: fix deadlock between mddev_suspend() and md_write_start()
---

026d15f6b9878794fae1f794cae881ccd65052e5
diff --cc drivers/md/md.c
index 31bcbfb09fef,66f6b928a80b..8cdca0296749
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@@ -5432,6 -5449,11 +5449,11 @@@ int md_run(struct mddev *mddev
  		if (!mddev->bio_set)
  			return -ENOMEM;
  	}
+ 	if (mddev->sync_set == NULL) {
 -		mddev->sync_set = bioset_create(BIO_POOL_SIZE, 0);
++		mddev->sync_set = bioset_create(BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
+ 		if (!mddev->sync_set)
+ 			return -ENOMEM;
+ 	}
  
  	spin_lock(&pers_lock);
  	pers = find_pers(mddev->level, mddev->clevel);