From patchwork Thu Nov 3 15:43:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 14952 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp609881wru; Thu, 3 Nov 2022 08:44:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4r2kt84TdoBEtb1XM0d1y4Eyu6l7Ke884YwRVxUZZiUwfp6GZgspanj46HjujoGz9pCXi2 X-Received: by 2002:a63:485f:0:b0:458:764a:2224 with SMTP id x31-20020a63485f000000b00458764a2224mr26160837pgk.620.1667490279946; Thu, 03 Nov 2022 08:44:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667490279; cv=none; d=google.com; s=arc-20160816; b=h/+8kt6o27wzZ21xa6OmaprlQxArfT0bniBgjS3H96cBhloyh41zyPhX1FoiVe1fVs dSd2zxzjAceogKvtFwV0jYVi3w22BoZZK/isVlDjetZlUD97NS4sJ2GThPfjRqi097k0 iy6KhK16SexBS0KL8xYnEbs+pqWQQjC0Jg8d+qEN+/n704CDuGqd7AY0hKUyIiQ+rwxW rN5WNfEsQC7vDslH56Onik/BTjuMrl8W7UYLRxuUuz1TDZLJmrpHmSe09ilCCmu4fhEt 3yUa1/BM+lgVcVOWkDObh1HbmvKTYPPZu8xQeD6RVq7jb9niwhyZU7ob0yOmW4UJIejM r2JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ghCshfUGaEw/Q+3k/HGBASfyf6E51G+0Npso3iy3cZc=; b=E/3PfoHSFC5FnC1VQ/v0HoNRtWz6Uxd2PIV6Xh0rKj5Bf8AqZK37YHHedKXxjynupi MYN+D0Yp3CNPr3hB9KCLjnPBdBzeZ+u3k22AFi8uYPfR/EKjrhTar8EC2VxqY56wqzXX RI46Kz92LN0JlfLukdS1VZEkd0dOtxtpfNSADYQvWCbo8unNQintywfLEDczV9BSN0Cy rZjVGYs9STIPO+9Gd/z3tWCGlc7q/Y57va8MH0HEHrm1WWBNuE/S0cySXY1gQ7QIEJga khWf1/ArjND4i+TM76nd+krgf0LkHEpJGKxap2iXYe5QMYvrQoiYpqdK7lQbKMhhi5p9 Eb0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=CPM3rt4h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t20-20020a63d254000000b0046f33e40222si1277068pgi.669.2022.11.03.08.44.26; Thu, 03 Nov 2022 08:44:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=CPM3rt4h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232010AbiKCPoH (ORCPT + 99 others); Thu, 3 Nov 2022 11:44:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232237AbiKCPnz (ORCPT ); Thu, 3 Nov 2022 11:43:55 -0400 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D49A1C920 for ; Thu, 3 Nov 2022 08:43:47 -0700 (PDT) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A3Fh7OT008963 for ; Thu, 3 Nov 2022 08:43:47 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=ghCshfUGaEw/Q+3k/HGBASfyf6E51G+0Npso3iy3cZc=; b=CPM3rt4h/kjNRH4+T9Jq/yi9Zw04cOyPDQO/qIT6ewQtU5rCNMpXM06wCBv/r4L1O8EI eQxud4qVLC4129GkuvwXTYroYK0P7z1KzMbEeYzXiqHJE2DNX9kxScl5RSF04H6X7fg4 cz2TPmC68stWuXfRJIozhIZsGGWhYCbqRT7bFS/4fyONG11ESqjx9bdP4VcMVzb4FXfc XVOY7ZDZXem7j43+oGdglJ1n7YZ/hfz3zHsbm84Yjae4rh75J0drr1SEvy0Ajt0wdEAU bSpWcN4bTvtDreTBxhods2ryAUVfIc06j0s34WMqzeIYYsTYcsGPOt3qSJCZMkxWVca0 CQ== Received: from maileast.thefacebook.com ([163.114.130.8]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3km3ubnqpv-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 03 Nov 2022 08:43:47 -0700 Received: from twshared6758.06.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 3 Nov 2022 08:43:45 -0700 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 50B53AA9DAFA; Thu, 3 Nov 2022 08:43:40 -0700 (PDT) From: Keith Busch To: CC: , Keith Busch , Christoph Hellwig , Chaitanya Kulkarni , "Darrick J . Wong" , Bart Van Assche Subject: [PATCHv2] iomap: directly use logical block size Date: Thu, 3 Nov 2022 08:43:39 -0700 Message-ID: <20221103154339.2150274-1-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: I5MAQ_iv35lv4Ireut1_A-xb7Fov4nj8 X-Proofpoint-GUID: I5MAQ_iv35lv4Ireut1_A-xb7Fov4nj8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-03_04,2022-11-03_01,2022-06-22_01 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748490287420703517?= X-GMAIL-MSGID: =?utf-8?q?1748490287420703517?= From: Keith Busch Don't transform the logical block size to a bit shift only to shift it back to the original block size. Just use the size. Cc: Christoph Hellwig Reviewed-by: Chaitanya Kulkarni Reviewed-by: Darrick J. Wong Reviewed-by: Bart Van Assche Signed-off-by: Keith Busch Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig --- v1->v2: Get rid of the temporary variable since it's only used once (hch) fs/iomap/direct-io.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index 4eb559a16c9e..9804714b1751 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -240,7 +240,6 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, { const struct iomap *iomap = &iter->iomap; struct inode *inode = iter->inode; - unsigned int blkbits = blksize_bits(bdev_logical_block_size(iomap->bdev)); unsigned int fs_block_size = i_blocksize(inode), pad; loff_t length = iomap_length(iter); loff_t pos = iter->pos; @@ -252,7 +251,7 @@ static loff_t iomap_dio_bio_iter(const struct iomap_iter *iter, size_t copied = 0; size_t orig_count; - if ((pos | length) & ((1 << blkbits) - 1) || + if ((pos | length) & (bdev_logical_block_size(iomap->bdev) - 1) || !bdev_iter_is_aligned(iomap->bdev, dio->submit.iter)) return -EINVAL;