From patchwork Tue Apr 5 12:07:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8759001 Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 299C2C0553 for ; Wed, 6 Apr 2016 07:56:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6404A20219 for ; Wed, 6 Apr 2016 07:56:20 +0000 (UTC) Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80394201D3 for ; Wed, 6 Apr 2016 07:56:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u367rbpt015225; Wed, 6 Apr 2016 03:53:37 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u35C8nXU003712 for ; Tue, 5 Apr 2016 08:08:49 -0400 Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com [10.5.110.27]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u35C8nIe013701 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 5 Apr 2016 08:08:49 -0400 Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CF63B804E5; Tue, 5 Apr 2016 12:08:48 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id r187so1188914pfr.2; Tue, 05 Apr 2016 05:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=q5dIZlHf5x3RrordGGmQBpr5UAU8kaCQjcf7f4VvZco=; b=oic6fpqz9yXDnn6bAUeMx/6oZPP47HnGJex00kmwu4oJaeLvvJBJ/Ohxh1ux/poxDn wRYDh3mQzfHEaN5mID3N1blZR4STCD7YaosCrsfTmosnEzbNwxI/b9eouovhIP6F9Pkc vnD+DGkVdSuj7qKOUpI0I43FyUn8yicYa5nqqPkOL1rnXszWLDvxkfvT7Vlhx+XR12WD JaYgzMqXoAd0GDUmOb1z3OuJSz+PzzEAvUqaMpxi8RwDzelR5jNwx61rTIYHu+HhPNim GyJLdiDUJjEAyMnI7C3mw9VKsMCH2zU6S7/BeSsOluhvrkaPU8vM/ZHw8ty6a4/DMWIC Qg2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=q5dIZlHf5x3RrordGGmQBpr5UAU8kaCQjcf7f4VvZco=; b=W7/QJ1LpU1qwtl52TcL/ilXTa/wvY+yML/P1k13ICZsD98jvb7YOn2JoVAU2rS6OpT 80hn3RuMtpwg5rBqKemv8x9oj3w4qtW2sH3srB+SxHNO8/Fcm6uLOB5ZN3KyACV4uphZ 2ETx5z9pu+iEZ7YTDGv5uMeGSKfDJ7LZRZI7bQuQf7nOUpQtmTNk7DppXg+xyEdmoQzG ook5fWjjhe5pYbZ3i2Y4XRe0tcUfUKwBmRZLPk/k7FGVesilvPhRooqeY34oh2P1poBj vBYNlhQc1BrWj4OVL8pt830UfJ3xtn3lJr1KFjmzflr4O04Qf/Z19q4YW41bU3JsomxO zACw== X-Gm-Message-State: AD7BkJLPTbScW0UyhtsJeopmanoZ/dIp9++KiGOO48VUQEhls0oYaOx4juscdMnlshedzg== X-Received: by 10.98.1.197 with SMTP id 188mr29006382pfb.8.1459858128352; Tue, 05 Apr 2016 05:08:48 -0700 (PDT) Received: from localhost (56.34.213.162.lcy-01.canonistack.canonical.com. [162.213.34.56]) by smtp.gmail.com with ESMTPSA id u21sm46522437pfa.60.2016.04.05.05.08.45 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 05 Apr 2016 05:08:47 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Date: Tue, 5 Apr 2016 20:07:34 +0800 Message-Id: <1459858062-21075-5-git-send-email-tom.leiming@gmail.com> In-Reply-To: <1459858062-21075-1-git-send-email-tom.leiming@gmail.com> References: <1459858062-21075-1-git-send-email-tom.leiming@gmail.com> X-RedHat-Spam-Score: -0.001 (BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.192.195 mail-pf0-f195.google.com 209.85.192.195 mail-pf0-f195.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Scanned-By: MIMEDefang 2.76 on 10.5.110.27 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Wed, 06 Apr 2016 03:52:39 -0400 Cc: Christoph Hellwig , Mike Snitzer , Boaz Harrosh , Ming Lei , linux-block@vger.kernel.org, "maintainer:DEVICE-MAPPER LVM, Shaohua Li , linux-raid@vger.kernel.org open list:SOFTWARE RAID Multiple DisksSUPPORT" , Alasdair Kergon Subject: [dm-devel] [PATCH 19/27] dm: dm.c: replace 'bio->bi_vcnt == 1' with !bio_multiple_segments X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ming Lei --- drivers/md/dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index be49057..4c34f88 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2172,7 +2172,8 @@ static void dm_request_fn(struct request_queue *q) pos = blk_rq_pos(rq); if ((dm_request_peeked_before_merge_deadline(md) && - md_in_flight(md) && rq->bio && rq->bio->bi_vcnt == 1 && + md_in_flight(md) && rq->bio && + !bio_multiple_segments(rq->bio) && md->last_rq_pos == pos && md->last_rq_rw == rq_data_dir(rq)) || (ti->type->busy && ti->type->busy(ti))) { blk_delay_queue(q, HZ / 100);