[PATCH] blk: fix merge bug in as-iosched

[mv-sheeva.git] / drivers / block / as-iosched.c

diff --git a/drivers/block/as-iosched.c b/drivers/block/as-iosched.c
index 4081c36c8c19eb6f95ba2bdb5e46990d5a7c3730..56417223481946ca499c8305da27ef065485068f 100644 (file)
--- a/drivers/block/as-iosched.c
+++ b/drivers/block/as-iosched.c
@@ -1344,6 +1344,7 @@ as_add_aliased_request(struct as_data *ad, struct as_rq *arq, struct as_rq *alia
         * Don't want to have to handle merges.
         */
        as_del_arq_hash(arq);
+       arq->request->flags |= REQ_NOMERGE;
 }
 
 /*