From 1c21abfbcfc6172ad7caed28abf06f7929809723 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Wed, 1 Oct 2003 17:38:13 -0700 Subject: [PATCH] [PATCH] AS buglet This one won't cause hangs, but can trip some WARNs. --- drivers/block/as-iosched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/as-iosched.c b/drivers/block/as-iosched.c index 524ac8882fc02..fc5dcb7525c9a 100644 --- a/drivers/block/as-iosched.c +++ b/drivers/block/as-iosched.c @@ -1610,7 +1610,8 @@ static void as_merged_request(request_queue_t *q, struct request *req) */ } - q->last_merge = req; + if (arq->on_hash) + q->last_merge = req; } static void -- 2.53.0