From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FB7DC433EF for ; Tue, 12 Oct 2021 16:45:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 198566108F for ; Tue, 12 Oct 2021 16:45:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229495AbhJLQrA (ORCPT ); Tue, 12 Oct 2021 12:47:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbhJLQrA (ORCPT ); Tue, 12 Oct 2021 12:47:00 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9545CC061570 for ; Tue, 12 Oct 2021 09:44:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=/5uYh4ExOIZhja/8G0h5dj7VL0zcyNA471aQT2/JKso=; b=Mj1H9h83lvDw+KbJx3FLLp0PWi 9Yd7tiEVrw9YZ69fH3KF48RaV/G8dfaEYcabcwox6KlyC/H+fwzBE3QhLDTBovihKgbnwmGyYlhR9 q+vtajCQEzuEkIi88OPY9NVOfIcUkMg5nbjUFuBUjhAM5kA9XSgVASFxAMe8XyDiYb7ZwqKtQU2DI f2HFLV3dCew1WMq3dGsEhRe2ec4bbrH9r87X/mZr3vmXzMFO+CCE7W2HhU2J1Mksoxe/kDV0Z2IDY mt3QATLdb/BY4hyJFS3VOokbN/dytTajqOH0nCCDpuYRe6JjpXvHRkjt2tBghzWMx3SEksI6xNyUJ g6OzUufg==; Received: from [2001:4bb8:199:73c5:f5ed:58c2:719f:d965] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1maKri-006f89-6Y; Tue, 12 Oct 2021 16:43:27 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Mike Snitzer , linux-block@vger.kernel.org, dm-devel@redhat.com Subject: [PATCH 5/5] block: pass the start sector to get_max_io_size Date: Tue, 12 Oct 2021 18:36:13 +0200 Message-Id: <20211012163613.994933-6-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012163613.994933-1-hch@lst.de> References: <20211012163613.994933-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Pass the start sector instead of the whole bio. Signed-off-by: Christoph Hellwig --- block/blk-merge.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index 15b2aef1507e5..b397972b526a0 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -174,12 +174,10 @@ static struct bio *blk_bio_write_same_split(struct request_queue *q, * requests that are submitted to a block device if the start of a bio is not * aligned to a physical block boundary. */ -static inline unsigned get_max_io_size(struct request_queue *q, - struct bio *bio) +static inline unsigned get_max_io_size(struct request_queue *q, sector_t sector) { unsigned pbs = queue_physical_block_size(q) >> SECTOR_SHIFT; unsigned lbs = queue_logical_block_size(q) >> SECTOR_SHIFT; - sector_t sector = bio->bi_iter.bi_sector; unsigned start_offset = sector & (pbs - 1); unsigned sectors = q->limits.max_sectors; unsigned max_sectors; @@ -287,7 +285,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q, struct bio_vec bv, bvprv, *bvprvp = NULL; struct bvec_iter iter; unsigned nsegs = 0, sectors = 0; - const unsigned max_sectors = get_max_io_size(q, bio); + const unsigned max_sectors = get_max_io_size(q, bio->bi_iter.bi_sector); const unsigned max_segs = queue_max_segments(q); bio_for_each_bvec(bv, bio, iter) { -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEC9EC433F5 for ; Tue, 12 Oct 2021 16:45:12 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 409876108F for ; Tue, 12 Oct 2021 16:45:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 409876108F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-336-D1rtfpgPMl6mArI3vu2c3w-1; Tue, 12 Oct 2021 12:45:07 -0400 X-MC-Unique: D1rtfpgPMl6mArI3vu2c3w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D99F118D6A2C; Tue, 12 Oct 2021 16:45:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 987875D6A8; Tue, 12 Oct 2021 16:45:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3A92F180598A; Tue, 12 Oct 2021 16:45:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19CGj0WC025921 for ; Tue, 12 Oct 2021 12:45:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC6AF404727A; Tue, 12 Oct 2021 16:44:59 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E87954047272 for ; Tue, 12 Oct 2021 16:44:59 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CFD388007B1 for ; Tue, 12 Oct 2021 16:44:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-572-G1Jjr72oOMGQMWTSObpyzg-1; Tue, 12 Oct 2021 12:44:58 -0400 X-MC-Unique: G1Jjr72oOMGQMWTSObpyzg-1 Received: from [2001:4bb8:199:73c5:f5ed:58c2:719f:d965] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1maKri-006f89-6Y; Tue, 12 Oct 2021 16:43:27 +0000 From: Christoph Hellwig To: Jens Axboe Date: Tue, 12 Oct 2021 18:36:13 +0200 Message-Id: <20211012163613.994933-6-hch@lst.de> In-Reply-To: <20211012163613.994933-1-hch@lst.de> References: <20211012163613.994933-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-loop: dm-devel@redhat.com Cc: linux-block@vger.kernel.org, dm-devel@redhat.com, Mike Snitzer Subject: [dm-devel] [PATCH 5/5] block: pass the start sector to get_max_io_size 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: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Pass the start sector instead of the whole bio. Signed-off-by: Christoph Hellwig --- block/blk-merge.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index 15b2aef1507e5..b397972b526a0 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -174,12 +174,10 @@ static struct bio *blk_bio_write_same_split(struct request_queue *q, * requests that are submitted to a block device if the start of a bio is not * aligned to a physical block boundary. */ -static inline unsigned get_max_io_size(struct request_queue *q, - struct bio *bio) +static inline unsigned get_max_io_size(struct request_queue *q, sector_t sector) { unsigned pbs = queue_physical_block_size(q) >> SECTOR_SHIFT; unsigned lbs = queue_logical_block_size(q) >> SECTOR_SHIFT; - sector_t sector = bio->bi_iter.bi_sector; unsigned start_offset = sector & (pbs - 1); unsigned sectors = q->limits.max_sectors; unsigned max_sectors; @@ -287,7 +285,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q, struct bio_vec bv, bvprv, *bvprvp = NULL; struct bvec_iter iter; unsigned nsegs = 0, sectors = 0; - const unsigned max_sectors = get_max_io_size(q, bio); + const unsigned max_sectors = get_max_io_size(q, bio->bi_iter.bi_sector); const unsigned max_segs = queue_max_segments(q); bio_for_each_bvec(bv, bio, iter) { -- 2.30.2 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel