From mboxrd@z Thu Jan 1 00:00:00 1970 From: majianpeng Subject: [PATCH 1/3] block: Add REQ_NOMERGE into REQ_COMMON_MASK Date: Wed, 30 Oct 2013 10:41:39 +0800 Message-ID: <2013103010413537651613@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 Rm9yIGJpbyB3aXRoIFJFUV9OT01FUkdFLGl0IG1lYW4gdGhpcyBiaW8gY2FuJ3QgbWVyZ2Ugd2l0 aCBvdGhlciBiaW9zLg0KQW5kIHRoZSByZXF1ZXN0IHdpdGggdGhpcyBiaW8gaGFzIHRoZSBzYW1l IG1lYW5pbmcuDQpJbiBibGtfcXVldWVfYmlvLCBiaW8gd2l0aCBSRVFfTk9NRVJHRSBjYW4ndCBi ZSBtZXJnZWQgYW5kIGdldCBhIG5ldw0KcmVxdWVzdC4gQnV0IGluIGluaXRfcmVxdWVzdF9mcm9t X2JpbywgcmVxdWVzdCBjYW4ndCB0ZXN0IFJFUV9OT01FUkdFLg0KU28gdGhlIHJlcXVlc3QgY2Fu IG1lcmdlIG90aGVyIGJpbyBvciBtZXJnZSBvdGhlciByZXF1ZXN0Lg0KQWRkIFJFUV9OT01FUkdF IGludG8gUkVRX0NPTU1PTl9NQVNLIHRvIGF2b2lkIHRoaXMuDQoNClNpZ25lZC1vZmYtYnk6IEpp YW5wZW5nIE1hIDxtYWppYW5wZW5nQGdtYWlsLmNvbT4NCi0tLQ0KIGluY2x1ZGUvbGludXgvYmxr X3R5cGVzLmggfCAyICstDQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0 aW9uKC0pDQoNCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2Jsa190eXBlcy5oIGIvaW5jbHVk ZS9saW51eC9ibGtfdHlwZXMuaA0KaW5kZXggZmExYWJlYi4uZmM3ZjRjNSAxMDA2NDQNCi0tLSBh L2luY2x1ZGUvbGludXgvYmxrX3R5cGVzLmgNCisrKyBiL2luY2x1ZGUvbGludXgvYmxrX3R5cGVz LmgNCkBAIC0xOTcsNyArMTk3LDcgQEAgZW51bSBycV9mbGFnX2JpdHMgew0KICNkZWZpbmUgUkVR X0NPTU1PTl9NQVNLIFwNCiAJKFJFUV9XUklURSB8IFJFUV9GQUlMRkFTVF9NQVNLIHwgUkVRX1NZ TkMgfCBSRVFfTUVUQSB8IFJFUV9QUklPIHwgXA0KIAkgUkVRX0RJU0NBUkQgfCBSRVFfV1JJVEVf U0FNRSB8IFJFUV9OT0lETEUgfCBSRVFfRkxVU0ggfCBSRVFfRlVBIHwgXA0KLQkgUkVRX1NFQ1VS RSkNCisJIFJFUV9TRUNVUkUgfCBSRVFfTk9NRVJHRSkNCiAjZGVmaW5lIFJFUV9DTE9ORV9NQVNL CQlSRVFfQ09NTU9OX01BU0sNCiANCiAjZGVmaW5lIEJJT19OT19BRFZBTkNFX0lURVJfTUFTSwko UkVRX0RJU0NBUkR8UkVRX1dSSVRFX1NBTUUpDQotLSANCjEuOC40 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753079Ab3J3CmQ (ORCPT ); Tue, 29 Oct 2013 22:42:16 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:59455 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752010Ab3J3Cly (ORCPT ); Tue, 29 Oct 2013 22:41:54 -0400 Date: Wed, 30 Oct 2013 10:41:39 +0800 From: majianpeng To: axboe , NeilBrown Cc: LKML , linux-raid Reply-To: majianpeng Subject: [PATCH 1/3] block: Add REQ_NOMERGE into REQ_COMMON_MASK X-Priority: 3 X-GUID: F0F53160-0C14-4546-8EC2-4E500F4B9F62 X-Has-Attach: no X-Mailer: Foxmail 7.0.1.93[cn] Mime-Version: 1.0 Message-ID: <2013103010413537651613@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 r9U2gq2Y017363 For bio with REQ_NOMERGE,it mean this bio can't merge with other bios. And the request with this bio has the same meaning. In blk_queue_bio, bio with REQ_NOMERGE can't be merged and get a new request. But in init_request_from_bio, request can't test REQ_NOMERGE. So the request can merge other bio or merge other request. Add REQ_NOMERGE into REQ_COMMON_MASK to avoid this. Signed-off-by: Jianpeng Ma --- include/linux/blk_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index fa1abeb..fc7f4c5 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -197,7 +197,7 @@ enum rq_flag_bits { #define REQ_COMMON_MASK \ (REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \ REQ_DISCARD | REQ_WRITE_SAME | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | \ - REQ_SECURE) + REQ_SECURE | REQ_NOMERGE) #define REQ_CLONE_MASK REQ_COMMON_MASK #define BIO_NO_ADVANCE_ITER_MASK (REQ_DISCARD|REQ_WRITE_SAME) -- 1.8.4{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I