From mboxrd@z Thu Jan 1 00:00:00 1970 From: majianpeng Subject: [PATCH 2/3] block: Check bio can merge before call attempt_plug_merge. Date: Wed, 30 Oct 2013 10:41:42 +0800 Message-ID: <2013103010413863125714@gmail.com> Reply-To: majianpeng Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: base64 Return-path: Sender: linux-kernel-owner@vger.kernel.org To: axboe , NeilBrown Cc: LKML , linux-raid List-Id: linux-raid.ids U2lnbmVkLW9mZi1ieTogSmlhbnBlbmcgTWEgPG1hamlhbnBlbmdAZ21haWwuY29tPg0KLS0tDQog YmxvY2svYmxrLWNvcmUuYyB8IDIgKy0NCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyks IDEgZGVsZXRpb24oLSkNCg0KZGlmZiAtLWdpdCBhL2Jsb2NrL2Jsay1jb3JlLmMgYi9ibG9jay9i bGstY29yZS5jDQppbmRleCAwYTAwZTRlLi5mYjk3MGZkIDEwMDY0NA0KLS0tIGEvYmxvY2svYmxr LWNvcmUuYw0KKysrIGIvYmxvY2svYmxrLWNvcmUuYw0KQEAgLTE0OTIsNyArMTQ5Miw3IEBAIHZv aWQgYmxrX3F1ZXVlX2JpbyhzdHJ1Y3QgcmVxdWVzdF9xdWV1ZSAqcSwgc3RydWN0IGJpbyAqYmlv KQ0KIAkgKiBDaGVjayBpZiB3ZSBjYW4gbWVyZ2Ugd2l0aCB0aGUgcGx1Z2dlZCBsaXN0IGJlZm9y ZSBncmFiYmluZw0KIAkgKiBhbnkgbG9ja3MuDQogCSAqLw0KLQlpZiAoYXR0ZW1wdF9wbHVnX21l cmdlKHEsIGJpbywgJnJlcXVlc3RfY291bnQpKQ0KKwlpZiAobGlrZWx5KGJpb19tZXJnZWFibGUo YmlvKSkgJiYgYXR0ZW1wdF9wbHVnX21lcmdlKHEsIGJpbywgJnJlcXVlc3RfY291bnQpKQ0KIAkJ cmV0dXJuOw0KIA0KIAlzcGluX2xvY2tfaXJxKHEtPnF1ZXVlX2xvY2spOw0KLS0gDQoxLjguNA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753218Ab3J3CmS (ORCPT ); Tue, 29 Oct 2013 22:42:18 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:54131 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751968Ab3J3Cly (ORCPT ); Tue, 29 Oct 2013 22:41:54 -0400 Date: Wed, 30 Oct 2013 10:41:42 +0800 From: majianpeng To: axboe , NeilBrown Cc: LKML , linux-raid Reply-To: majianpeng Subject: [PATCH 2/3] block: Check bio can merge before call attempt_plug_merge. X-Priority: 3 X-GUID: 3DBCCC56-C955-42C2-BD95-1BBEF90DF873 X-Has-Attach: no X-Mailer: Foxmail 7.0.1.93[cn] Mime-Version: 1.0 Message-ID: <2013103010413863125714@gmail.com> Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id r9U2gRvR017351 Signed-off-by: Jianpeng Ma --- block/blk-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-core.c b/block/blk-core.c index 0a00e4e..fb970fd 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1492,7 +1492,7 @@ void blk_queue_bio(struct request_queue *q, struct bio *bio) * Check if we can merge with the plugged list before grabbing * any locks. */ - if (attempt_plug_merge(q, bio, &request_count)) + if (likely(bio_mergeable(bio)) && attempt_plug_merge(q, bio, &request_count)) return; spin_lock_irq(q->queue_lock); -- 1.8.4{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I