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 5739EC433F5 for ; Wed, 13 Oct 2021 17:20:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 359FD610A0 for ; Wed, 13 Oct 2021 17:20:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229967AbhJMRWN (ORCPT ); Wed, 13 Oct 2021 13:22:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229915AbhJMRWL (ORCPT ); Wed, 13 Oct 2021 13:22:11 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CD13C061570 for ; Wed, 13 Oct 2021 10:20:07 -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=V9LTBznSTbrKR3qRBOObxetYrHArqxvMcS4EP7ICEEc=; b=oQBw8Sx9IYmp9k4pwO4WWL60ij 73s3CMpe72Leff+mGWahKgv7YDeKr1qRg0IbRlAn0rnl+/muRc3Bkz4ts+MYWRHHt94naNDT/UtJ3 IxPkP+aEYrBErMF8UMDlwfS7HoEWnSYiS4DsiULKaQVn29EdnVgM46DOUHNipHi2LCH9P0yKIVxuu T33HKJtXZMpQ8e5kR7bJkaMJKnoyJ93Elrvm7emockAjoC8gqZu0iMaVjKwJe17NCSDflsb0yL+Xd cad5lOfdjSoMbnC3AWBefx9ghUR3dTCW/cvlBonzJEWvMDewxMZJaceuxtY+IoZ+IpvICiYYYXxVV 34dA6ohA==; Received: from [2001:4bb8:199:73c5:265:8549:750e:c7f7] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mahti-007ef2-Dx; Wed, 13 Oct 2021 17:18:59 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Mike Snitzer , linux-block@vger.kernel.org, dm-devel@redhat.com Subject: [PATCH 6/6] block: pass the start sector to get_max_io_size Date: Wed, 13 Oct 2021 19:12:15 +0200 Message-Id: <20211013171215.1177671-7-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211013171215.1177671-1-hch@lst.de> References: <20211013171215.1177671-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 87ea3e7b8ad28..7498f570aa302 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; @@ -288,7 +286,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