Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935332Ab1ETF3G (ORCPT ); Fri, 20 May 2011 01:29:06 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:38329 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934850Ab1ETF3E (ORCPT ); Fri, 20 May 2011 01:29:04 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=dzmBZYcucb/fF+groy/1Ih9JmSHWqfbvCuk0gRULrxwkdBf0OhYriTzxYum0Gv4bWP CglNpvvSbXkUyu6wdvIaXoUbZWw7RApqrxaBZ4qTjjvorb7StK8YAe3V+rvtd40Z5NCC 6Zoyr08u4zyfbbb6zF9ov4eDOpjy0v3sudEhs= From: Namhyung Kim To: Jens Axboe Cc: linux-kernel@vger.kernel.org, Divyesh Shah Subject: [PATCH] block: call elv_bio_merged() when merged Date: Fri, 20 May 2011 14:28:57 +0900 Message-Id: <1305869337-4375-1-git-send-email-namhyung@gmail.com> X-Mailer: git-send-email 1.7.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1172 Lines: 37 Commit 73c101011926 ("block: initial patch for on-stack per-task plugging") removed calls to elv_bio_merged() when @bio merged with @req. Re-add them. Signed-off-by: Namhyung Kim Cc: Divyesh Shah --- block/blk-core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 3fe00a14822a..4dc02ef5fc82 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1132,6 +1132,7 @@ static bool bio_attempt_back_merge(struct request_queue *q, struct request *req, req->ioprio = ioprio_best(req->ioprio, bio_prio(bio)); drive_stat_acct(req, 0); + elv_bio_merged(q, req, bio); return true; } @@ -1173,6 +1174,7 @@ static bool bio_attempt_front_merge(struct request_queue *q, req->ioprio = ioprio_best(req->ioprio, bio_prio(bio)); drive_stat_acct(req, 0); + elv_bio_merged(q, req, bio); return true; } -- 1.7.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/