Merge branches 'pm-sleep', 'pm-cpuidle', 'pm-cpufreq', 'pm-devfreq' and 'pm-avs'

[linux.git] / drivers / md / md-linear.c

diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c
index c766c559d36d54b7d84c4e0f676396d63e3c2926..26c75c0199fa1b3e8f54728fd76393ece6ced3f5 100644 (file)
--- a/drivers/md/md-linear.c
+++ b/drivers/md/md-linear.c
@@ -244,10 +244,9 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio)
        sector_t start_sector, end_sector, data_offset;
        sector_t bio_sector = bio->bi_iter.bi_sector;
 
-       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;
-       }
 
        tmp_dev = which_dev(mddev, bio_sector);
        start_sector = tmp_dev->end_sector - tmp_dev->rdev->sectors;