Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[mirror_ubuntu-bionic-kernel.git] / drivers / block / as-iosched.c

diff --git a/drivers/block/as-iosched.c b/drivers/block/as-iosched.c
index 4081c36c8c19eb6f95ba2bdb5e46990d5a7c3730..c6744ff382944a590767cef1827e627c1915c7ad 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;
 }
 
 /*
@@ -1972,8 +1973,8 @@ static int __init as_init(void)
 
 static void __exit as_exit(void)
 {
-       kmem_cache_destroy(arq_pool);
        elv_unregister(&iosched_as);
+       kmem_cache_destroy(arq_pool);
 }
 
 module_init(as_init);