From patchwork Sat Oct 29 08:08:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9403449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7670B60587 for ; Sat, 29 Oct 2016 08:32:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 641F8289C2 for ; Sat, 29 Oct 2016 08:32:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58CB929AC9; Sat, 29 Oct 2016 08:32:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 173CA289C2 for ; Sat, 29 Oct 2016 08:32:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941833AbcJ2Ibn (ORCPT ); Sat, 29 Oct 2016 04:31:43 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36063 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756894AbcJ2IMj (ORCPT ); Sat, 29 Oct 2016 04:12:39 -0400 Received: by mail-pf0-f193.google.com with SMTP id n85so3383618pfi.3; Sat, 29 Oct 2016 01:12:38 -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=4gsn2gVuYkeMNKTx3BUW6t0pvns2OxZYqp9yXTD5xJ8=; b=Z+82GVmxGlxR/BH3FDSvh60O4v2arlC7BANVqK/ih/bDaCMSn1SKQ/12/RyUXYqzFn v9T9dsd73uasRf/CFpmwgg5pA3DKncvUIOIuyGL1ovlq+QuIIWXTK1h8PGUlYaqkQCFb nrWi9gpkyiCy09FUEj7HCl7yhH3ZljxeRTyWbi+urrFeqEVgNia3iEIgrVacNlx/fnjc p73mHIsxzYZIslLHvParfYfoZLqmi4lGUCvJJVHd3ZmOdWyBczjbxBiAJ5UQQfURG/fU lbV3KmMfGyhjWaHb1D3Ov9EPkpT6QbZ0uXjMvn68KcDr25GUrY81jXQ21kKCKXFFo3EY YlvQ== 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=4gsn2gVuYkeMNKTx3BUW6t0pvns2OxZYqp9yXTD5xJ8=; b=NQDqYmvdngW0apiImezGJsuw79ydYEj0RJERffHgNKmUlmqquJ67Rfu9TT5gF2/9TM l11eZM2QaSgr+601ip3FuaajfUrfMYXoc+YBrcPB1BXVbEXZTiQpzgpMsBujjI4Z7xm3 YB4Wx3j3t/iE4eTT4iKv0338/DINxQXeuU1fdEw8Uy6FVtd/mEfXuG/8g6CKVOiNBw1U NW2EoR2q55B8HMFfHpZkynAJ97sxidbnABfXsbhHu61eu2t0rUeacEHutxmKZezkz59F aUCZN6Q9RSM2KjPNmHEC466XD27tDYtDKW1VZbGyzjK8hIgyBnV9V2+oLTcYxYRP0Kvo f0pQ== X-Gm-Message-State: ABUngvdlPjmr1tEdL5mmUeqr0o9FCPSNX2sGfmdVl+0w+GVLHEugfgEhdA7UXdeawJUUGA== X-Received: by 10.98.97.71 with SMTP id v68mr31724081pfb.133.1477728758334; Sat, 29 Oct 2016 01:12:38 -0700 (PDT) Received: from localhost ([45.34.23.101]) by smtp.gmail.com with ESMTPSA id dj3sm23581025pad.1.2016.10.29.01.12.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Oct 2016 01:12:37 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, Christoph Hellwig , "Kirill A . Shutemov" , Ming Lei , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com (maintainer:DEVICE-MAPPER (LVM)), Shaohua Li , linux-raid@vger.kernel.org (open list:SOFTWARE RAID (Multiple Disks) SUPPORT) Subject: [PATCH 09/60] dm: dm.c: replace 'bio->bi_vcnt == 1' with !bio_multiple_segments Date: Sat, 29 Oct 2016 16:08:08 +0800 Message-Id: <1477728600-12938-10-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477728600-12938-1-git-send-email-tom.leiming@gmail.com> References: <1477728600-12938-1-git-send-email-tom.leiming@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Avoid to access .bi_vcnt directly, because it may be not what the driver expected any more after supporting multipage bvec. Signed-off-by: Ming Lei --- drivers/md/dm-rq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index 1d0d2adc050a..8534cbf8ce35 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c @@ -819,7 +819,8 @@ static void dm_old_request_fn(struct request_queue *q) pos = blk_rq_pos(rq); if ((dm_old_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, 10);