1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 34cb065f6d66..8c9395f2028f 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3865,7 +3865,13 @@ static int make_request(struct request_queue *q, struct bio * bi)
         int cpu, remaining;
 
         if (unlikely(bio_rw_flagged(bi, BIO_RW_BARRIER))) {
-                bio_endio(bi, -EOPNOTSUPP);
+                /* Drain all pending writes.  We only really need
+                 * to ensure they have been submitted, but this is
+                 * easier.
+                 */
+                mddev->pers->quiesce(mddev, 1);
+                mddev->pers->quiesce(mddev, 0);
+                md_barrier_request(mddev, bi);
                 return 0;
         }