From mboxrd@z Thu Jan 1 00:00:00 1970 From: majianpeng Subject: [PATCH 3/3] md/raid5: For stripe with R5_ReadNoMerge, we replace REQ_FLUSH with REQ_NOMERGE. Date: Wed, 30 Oct 2013 10:41:46 +0800 Message-ID: <2013103010414134402615@gmail.com> Reply-To: majianpeng Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: base64 Return-path: Sender: linux-raid-owner@vger.kernel.org To: axboe , NeilBrown Cc: LKML , linux-raid List-Id: linux-raid.ids Rm9yIFI1X1JlYWROb01lcmdlLGl0IG1lYW4gdGhpcyBiaW8gY2FuJ3QgbWVyZ2Ugd2l0aCBvdGhl ciBiaW9zIG9yDQpyZXF1ZXN0Lkl0IHVzZWQgUkVRX0ZMVVNIIHRvIGFjaGlldmUgdGhpcy4gQnV0 IFJFUV9OT01FUkdFIGNhbiBkbyB0aGUNCnNhbWUgd29yay4NCg0KU2lnbmVkLW9mZi1ieTogSmlh bnBlbmcgTWEgPG1hamlhbnBlbmdAZ21haWwuY29tPg0KLS0tDQogZHJpdmVycy9tZC9yYWlkNS5j IHwgMiArLQ0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQ0K DQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZC9yYWlkNS5jIGIvZHJpdmVycy9tZC9yYWlkNS5jDQpp bmRleCBmOGI5MDY4Li44ZTBhZWFhIDEwMDY0NA0KLS0tIGEvZHJpdmVycy9tZC9yYWlkNS5jDQor KysgYi9kcml2ZXJzL21kL3JhaWQ1LmMNCkBAIC03NzIsNyArNzcyLDcgQEAgc3RhdGljIHZvaWQg b3BzX3J1bl9pbyhzdHJ1Y3Qgc3RyaXBlX2hlYWQgKnNoLCBzdHJ1Y3Qgc3RyaXBlX2hlYWRfc3Rh dGUgKnMpDQogCQkJCWJpLT5iaV9zZWN0b3IgPSAoc2gtPnNlY3Rvcg0KIAkJCQkJCSArIHJkZXYt PmRhdGFfb2Zmc2V0KTsNCiAJCQlpZiAodGVzdF9iaXQoUjVfUmVhZE5vTWVyZ2UsICZzaC0+ZGV2 W2ldLmZsYWdzKSkNCi0JCQkJYmktPmJpX3J3IHw9IFJFUV9GTFVTSDsNCisJCQkJYmktPmJpX3J3 IHw9IFJFUV9OT01FUkdFOw0KIA0KIAkJCWJpLT5iaV92Y250ID0gMTsNCiAJCQliaS0+YmlfaW9f dmVjWzBdLmJ2X2xlbiA9IFNUUklQRV9TSVpFOw0KLS0gDQoxLjguNA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752845Ab3J3Clz (ORCPT ); Tue, 29 Oct 2013 22:41:55 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:46123 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751292Ab3J3Clw (ORCPT ); Tue, 29 Oct 2013 22:41:52 -0400 Date: Wed, 30 Oct 2013 10:41:46 +0800 From: majianpeng To: axboe , NeilBrown Cc: LKML , linux-raid Reply-To: majianpeng Subject: [PATCH 3/3] md/raid5: For stripe with R5_ReadNoMerge, we replace REQ_FLUSH with REQ_NOMERGE. X-Priority: 3 X-GUID: 8DC05C51-ACFE-4902-B516-BFF05C4588E6 X-Has-Attach: no X-Mailer: Foxmail 7.0.1.93[cn] Mime-Version: 1.0 Message-ID: <2013103010414134402615@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 r9U2g2o9017347 For R5_ReadNoMerge,it mean this bio can't merge with other bios or request.It used REQ_FLUSH to achieve this. But REQ_NOMERGE can do the same work. Signed-off-by: Jianpeng Ma --- drivers/md/raid5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index f8b9068..8e0aeaa 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -772,7 +772,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s) bi->bi_sector = (sh->sector + rdev->data_offset); if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags)) - bi->bi_rw |= REQ_FLUSH; + bi->bi_rw |= REQ_NOMERGE; bi->bi_vcnt = 1; bi->bi_io_vec[0].bv_len = STRIPE_SIZE; -- 1.8.4{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I