diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-06-12 17:30:13 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-12 17:30:13 +0300 |
| commit | 8f66439eec46d652255b9351abebb540ee5b2fd9 (patch) | |
| tree | 94f4a41dc343cf769cd92f1f7711e9ce8ad43728 /drivers/md/raid1.c | |
| parent | 22ec656bcc3f38207ad5476ebad1e5005fb0f1ff (diff) | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) | |
| download | linux-8f66439eec46d652255b9351abebb540ee5b2fd9.tar.xz | |
Merge tag 'v4.12-rc5' into for-4.13/block
We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.
Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 94b87c4d0f7b..a1a3cf0293df 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -3063,6 +3063,8 @@ static int raid1_run(struct mddev *mddev) mdname(mddev)); return -EIO; } + if (mddev_init_writes_pending(mddev) < 0) + return -ENOMEM; /* * copy the already verified devices into our private RAID1 * bookkeeping area. [whatever we allocate in run(), |