diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-10-24 16:31:57 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-10-24 16:31:57 -0600 |
| commit | 9c6694bd96af42d69f493ca7ed844bcbcbcc76b1 (patch) | |
| tree | cd6dad0e96bd11ab36f613e7259434007ae5dada /drivers/md/raid1.c | |
| parent | dd85b4922de1b70f0729d2a7856db619e210a8ec (diff) | |
| parent | 6a5cb53aaa4ef515ddeffa04ce18b771121127b4 (diff) | |
| download | linux-9c6694bd96af42d69f493ca7ed844bcbcbcc76b1.tar.gz linux-9c6694bd96af42d69f493ca7ed844bcbcbcc76b1.tar.bz2 linux-9c6694bd96af42d69f493ca7ed844bcbcbcc76b1.zip | |
Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.5/drivers
Pull MD changes from Song.
* 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
md: no longer compare spare disk superblock events in super_load
md: improve handling of bio with REQ_PREFLUSH in md_flush_request()
md/bitmap: avoid race window between md_bitmap_resize and bitmap_file_clear_bit
md/raid0: Fix an error message in raid0_make_request()
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 0466ee2453b4..bb29aeefcbd0 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1567,10 +1567,9 @@ 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); + if (unlikely(bio->bi_opf & REQ_PREFLUSH) + && md_flush_request(mddev, bio)) return true; - } /* * There is a limit to the maximum size, but |