Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[mirror_ubuntu-artful-kernel.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 91b339f4d2ad3dc7c03cb6d4a849847f05731433..a687e9cc16c29fd765d133acc9199d92f5ce2377 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1725,6 +1725,11 @@ get_rq:
        if (sync)
                rw_flags |= REQ_SYNC;
 
+       /*
+        * Add in META/PRIO flags, if set, before we get to the IO scheduler
+        */
+       rw_flags |= (bio->bi_rw & (REQ_META | REQ_PRIO));
+
        /*
         * Grab a free request. This is might sleep but can not fail.
         * Returns with the queue unlocked.