Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next

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

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index ba19060bcf3f7142868c6d401f5dbc2e780fe633..8a2f767f26d80c2dc3c949914049cf14ef591ff0 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -294,8 +294,8 @@ static int linear_make_request (mddev_t *mddev, struct bio *bio)
        dev_info_t *tmp_dev;
        sector_t start_sector;
 
-       if (unlikely(bio->bi_rw & REQ_HARDBARRIER)) {
-               md_barrier_request(mddev, bio);
+       if (unlikely(bio->bi_rw & REQ_FLUSH)) {
+               md_flush_request(mddev, bio);
                return 0;
        }