Merge branch 'for-next' of git://git.kernel.org/pub/scm/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()

1 files changed, 12 insertions, 8 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 98ca2c1d3226..3febfc8391fb 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1321,7 +1321,6 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
          * Continue immediately if no resync is active currently.
          */
 
-        md_write_start(mddev, bio); /* wait on superblock update early */
 
         if ((bio_end_sector(bio) > mddev->suspend_lo &&
             bio->bi_iter.bi_sector < mddev->suspend_hi) ||
@@ -1335,7 +1334,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
                  */
                 DEFINE_WAIT(w);
                 for (;;) {
-                        flush_signals(current);
+                        sigset_t full, old;
                         prepare_to_wait(&conf->wait_barrier,
                                         &w, TASK_INTERRUPTIBLE);
                         if (bio_end_sector(bio) <= mddev->suspend_lo ||
@@ -1345,7 +1344,10 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
                                      bio->bi_iter.bi_sector,
                                      bio_end_sector(bio))))
                                 break;
+                        sigfillset(&full);
+                        sigprocmask(SIG_BLOCK, &full, &old);
                         schedule();
+                        sigprocmask(SIG_SETMASK, &old, NULL);
                 }
                 finish_wait(&conf->wait_barrier, &w);
         }
@@ -1550,13 +1552,13 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
         wake_up(&conf->wait_barrier);
 }
 
-static void raid1_make_request(struct mddev *mddev, struct bio *bio)
+static bool raid1_make_request(struct mddev *mddev, struct bio *bio)
 {
         sector_t sectors;
 
         if (unlikely(bio->bi_opf & REQ_PREFLUSH)) {
                 md_flush_request(mddev, bio);
-                return;
+                return true;
         }
 
         /*
@@ -1571,8 +1573,12 @@ static void raid1_make_request(struct mddev *mddev, struct bio *bio)
 
         if (bio_data_dir(bio) == READ)
                 raid1_read_request(mddev, bio, sectors, NULL);
-        else
+        else {
+                if (!md_write_start(mddev,bio))
+                        return false;
                 raid1_write_request(mddev, bio, sectors);
+        }
+        return true;
 }
 
 static void raid1_status(struct seq_file *seq, struct mddev *mddev)
@@ -2165,9 +2171,7 @@ static void sync_request_write(struct mddev *mddev, struct r1bio *r1_bio)
         struct r1conf *conf = mddev->private;
         int i;
         int disks = conf->raid_disks * 2;
-        struct bio *bio, *wbio;
-
-        bio = r1_bio->bios[r1_bio->read_disk];
+        struct bio *wbio;
 
         if (!test_bit(R1BIO_Uptodate, &r1_bio->state))
                 /* ouch - failed to read all of that. */