diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:52 +0800 |
| commit | e30546378ec2c5cc1a5ef97695d8ba859b0abd23 (patch) | |
| tree | 0a3c9d9ac448694a039a63db6549cfaebdaea07f /drivers/md | |
| parent | 7785301d9209cf083369c6f088cd1d48ec417863 (diff) | |
| parent | 99d4c5fe0b7838de15c59b375491ef075848d92d (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index c1c7d4fb4b77..eff554a12fb4 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -6771,7 +6771,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode, /* need to ensure recovery thread has run */ wait_event_interruptible_timeout(mddev->sb_wait, !test_bit(MD_RECOVERY_NEEDED, - &mddev->flags), + &mddev->recovery), msecs_to_jiffies(5000)); if (cmd == STOP_ARRAY || cmd == STOP_ARRAY_RO) { /* Need to flush page cache, and ensure no-one else opens |