From patchwork Fri Mar 10 03:08:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5p2O5oms6Z+s?= X-Patchwork-Id: 67192 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp659015wrd; Thu, 9 Mar 2023 19:17:33 -0800 (PST) X-Google-Smtp-Source: AK7set/mqYpnnx9BC/osPVyLEXiu8W4Z63x9Eih2wCl74Tt7L3ysyuAeRy1PL4iAt47C5D2EaLzR X-Received: by 2002:a17:90b:1e4b:b0:237:94a2:b531 with SMTP id pi11-20020a17090b1e4b00b0023794a2b531mr25285001pjb.2.1678418253005; Thu, 09 Mar 2023 19:17:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1678418252; cv=pass; d=google.com; s=arc-20160816; b=kiTaoUtyiMa5kA3qdA6Dy/i/8pEdvbFMNd+l0esK1ytzxii7Vc1BC96rPt7/t6Km1g owWKeBS5gL7t5p375fArSssZBkvSK9PhdqrtVVJUCx0B3RD2KbO0PEMc4gJV9QoY0FrM aAMvhScy/Ah1UCj3M7tkQvUwQNa0LqEZGls1jZy8/scUd7DR7KU2vPNH+ZlE+S/9MMvt yPKCnVSpkNCNfzJVNI9Ht3aJqFVst3VVHqeJjt1HDjAxO7fKtpWTcx6mnfZwA/526fOr cycwHyh3A/U04KSiMmesT/9LLqrcaSmhm3eu2mwHBqnYJaC6e8+Qv38ivwK/q32ET/Mw LuvQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=SapfSKyA5hjeA9Tpi9nggPtAuZODvYJOSu/24Rc8dH8=; b=eq/l5geSQoyOWeGxv/32J+p2WwRV1bE8aLYTcvk4k+iecoaaw+E5b8d1ynUbv9NU0R MH6h/XTjWHkhKAix/+ZGVUCn05HGLX6ivDMHxDqPE/f6k2G74uZ7xpslrp0aJn6s6Ph0 1EETfFVvFnkRiRTrdD5+H73JZZ/0J+bh4X0I1GFJiaXkUQz1sF1io5FE6coVPl6S6OpB +b4JHb0z8W8mAijAO5SF6MP/M8xS/pLkK8zkToJeFNdVQxemtugYsNtIsUddla1X6bDq 2hi9gJfJ3aYVY9Pml7+9CEiCvapksiuGSFnhf6xkNVJKUs+4ed8cwFC/VWvPJ++QH2pK 2hPg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=qeZWkIKG; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ay6-20020a17090b030600b00233bafad308si1332105pjb.150.2023.03.09.19.17.20; Thu, 09 Mar 2023 19:17:32 -0800 (PST) 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=@vivo.com header.s=selector2 header.b=qeZWkIKG; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229977AbjCJDIr (ORCPT + 99 others); Thu, 9 Mar 2023 22:08:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229754AbjCJDIo (ORCPT ); Thu, 9 Mar 2023 22:08:44 -0500 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2095.outbound.protection.outlook.com [40.107.117.95]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95B5DE1931 for ; Thu, 9 Mar 2023 19:08:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h/q/ber3wIdI4G/AAgqk7EyokhVxLA5yFtKJfBXfV4CHCDH6mCzWpklZFjw+YwDIraPCRW0KHVaz4A2+wmaDtfEkTGWYq1kmWVdZEOoHU5jAnrqV7GpFCiQYdtaNvk45f14bpcsEBrdx4gEo9gN1QfKWcKjoY9qnrUG0Bz05XDTa9uzzHnLe+yc3aN6j1GeXUU95B2PBEIlHHez7aimR5PhygZvt0RyI8j0334G0Tg34A9vpr3JlQm4PaPHKtcfo/YMtSl9AHkoUh9VgoKazrvPk6wUl6xiYLVMO1cJyI/8JrvE+8sUpg/lpAr1wwkQanXDUdWFi+WOo2DquslseFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SapfSKyA5hjeA9Tpi9nggPtAuZODvYJOSu/24Rc8dH8=; b=dy8XVRCXqhvKtYClvhtdLTayabXPgMQbI6F6ToZRxTLSm+twlNYPpAZ1DyWzb7Ff5/ESqKddoxppHmjTpAzzQW43vWl3OBXCcIVBKRHspBl27MJ2LI1jRGDxQf8RHhgLlPxJai1DE55XaewlZI0zPxO9ntClGK/xsY75KGKlCte7ES9CzlzeJ4ywfJDmoN0n4Y1BjOuy2Yh8KFXlB4NrdbV7iVxYzyFWbTdtxtrbgkbizQuHf/U5QbTnGnSUZiYSIyabL+ClcYzrYw56Sd4ZY8iaR1clN110G0tMJUbTF3M1Fj+dK3qAOTi7g69eF6mCwjs9Ui9eBq/n8Gak4CPQAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SapfSKyA5hjeA9Tpi9nggPtAuZODvYJOSu/24Rc8dH8=; b=qeZWkIKGnA/aY6Q1YywNWXsBVNLkQbgxh7emPFc/1Wa4OP7kuzm9/8IQiEAmqeal9CLHMBf0BI5NnoLgbL6sK3Z9XjxDNZ89/Ucngz7Pk8wN8Zw0LkL+jrqJXgXkx+sM57CLTa57bRJyIKyqJoXAuCz2mPRbj6Dt+lFar7lbW25OoW62sW1FDT9jRBEyJSuWRtOqAGwRNmBlZSg+S2LhlWndOVAqWfaF2c4VnNSgMU193CNo9GEs2mAH+TsnhNetoCayaikQCqG3s4DbBTH+VA9wOzWIWRHhBT7Cg3QsbPMI/6xa2WSH8eK/5eukeyctoLozkSREIbDTJJDnXybbcg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by KL1PR0601MB4275.apcprd06.prod.outlook.com (2603:1096:820:73::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.19; Fri, 10 Mar 2023 03:08:33 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::daf6:5ebb:a93f:1869]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::daf6:5ebb:a93f:1869%9]) with mapi id 15.20.6178.019; Fri, 10 Mar 2023 03:08:33 +0000 From: Yangtao Li To: almaz.alexandrovich@paragon-software.com, jack@suse.com, dushistov@mail.ru, brauner@kernel.org, ntfs3@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Yangtao Li Subject: [PATCH 1/3] fs/ntfs3: use wrapper i_blocksize() in ntfs_zero_range() Date: Fri, 10 Mar 2023 11:08:19 +0800 Message-Id: <20230310030821.66090-1-frank.li@vivo.com> X-Mailer: git-send-email 2.35.1 X-ClientProxiedBy: SI2PR02CA0026.apcprd02.prod.outlook.com (2603:1096:4:195::19) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|KL1PR0601MB4275:EE_ X-MS-Office365-Filtering-Correlation-Id: 2094acc3-f270-4212-97f6-08db2114bb9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hCUfcQxErox8Tyrpq6N62DFDvoXUJKgLaqAkQciRoRmVcXgKvUpe4Q/WSLboCEapJs+bOkj2JmOXmaqsTY6XNKDZz5HvTEaE9uulEhR66xi7KjIYvAJYs4kYg3nZgcGZIns9YYQaDYtwoGsIFjEJYaDXcJJW7LipypFigT3CeroY7f3n8aPY4sczBDoUVP3Sbz/uw/2odG0D+wCTMZS+ttcpUvxia9+Vq7o6nfzlVUNlRendrUxSZ/D/flBg85gHMCo8Drvhm2fCXY449Jb/x6RllaaTRfi8/hv14NijMLjS6O4hcgGxJktsZb9d99o9pac6bp7T5b5MlNVsKdsuYiYxCZOPdBlXWwDNtiHWgHHYwxdO4BYlzEGo3ULTAVd/vuavr2n9dxg3iGqCscCIrwfEwww4D149qIKRw0751JhA1hTk7ayzBodEJ3WoLaFMtw/AnmHWujODdvHtuZo8OIgM3L3yj4kDEfvrmk3OSrEmKpyplCHFqjQJ3LdA0e3HcYA+UDvkrAzKMRTiIH7S4eBq0wLuW0+f6adLom6BIJmvefE4Q8niLDiFlMePlKKUeWOMMnes9zacUp3f/I7/s4XNde4UoGIMNq+z4r0zBWA6riBX6jjJXk9ngfk6J9/3MVVY6R+vW9Hs6oXykhq6RrkGr07D0wx8hTqYOitABufrR1wZhd3h7jZ3vnniLnUAt4matyAY3DKhH+dX4gGeVg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(136003)(346002)(39860400002)(366004)(396003)(451199018)(36756003)(5660300002)(83380400001)(107886003)(6666004)(26005)(6486002)(1076003)(2616005)(52116002)(6506007)(6512007)(478600001)(316002)(4326008)(66946007)(66476007)(8676002)(8936002)(41300700001)(66556008)(86362001)(186003)(38350700002)(38100700002)(2906002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Bjiue+JRBlzWhuqnjm8kfq4oaJnWJrC4q8hYVF69bcbWwUhTkgIX5U637sFdSRMINsU0f4DNy4CbTeON6Qgzc9m9HMoMmt67K9+dQ1gU/IeG0xBdIlJjyqAalBJU8bN48PZc5O8fsyundsnj1jSL2z4oBNXHf9QuE5Mz9Dz0fQTor6aJ/D2DHIcYYPfN5JWt+Yit634F0hocgwqR1aokFLqBQDkMBHpOXGlVd6gUlQwhFdQ22P+ICoVL5iMkGbaInWUFJczIY0UpElwykTOMiO2iu4l70EyzUjY9NNGVCFEmCI2btw8S/8mrbISkZE9lmshlQvnUMjQV2uDU8ET7ltdl3rbcfAs0Fr2/GpPsg94n1ceKdGcx+YeKf36cwhziAWGdmhRA/4LcbjbONc/Q7KHDnQin2F+EQdjI/9E5vLQ5SrUZXqMyVKEfsQbRp73B+9CMWEFAzDNmFpeKxI7lceAtTrosPIGhN/nZAWmSUCYbIeJ8eggt02jg1J0jJhoJwgG3TL+lHnssCRYpnJ/aVyCTeTg1KWpNw13X7aSULzt46rVJStD9vniXWWXv3e5c6AEZSLYVZFcIB9bAnc3UG1tmDUAiZJfa33lZCz4Z2+6C8f0wYQlumTh3uN52u7zmdT2vToW7KtMmqhgIpHiPElfhQIKXYjYb3mEYOgifKGf+n5VFu+SU5irZLj7JXmFUWx2FGgs/gMwakQX987c+jSZegGFgrU1uZaBsV+bZGfbS/tTmXLvqozQVzZtAtnlKlNDg+IrWf9oTE2KCz/bL9ugTL8wMsyguRkvsm5nlf8o0b3SBI2RxXIAF/bF2buy7TFQ9PqyzDb1+UNkTKUmdJf6/nKwfpuDy0V0MvKFiIJ1hPhSAMuUYScKfKSAGNcZFwiMRDXPHUmKhg15+s2Cg//OvWt/7Xpul070HNCrsYeRvg58w8JQ16pH1yPQmbKLddSVF0xPcebvfQka0I0xu8l+ESfyWDpfO0If5iaFt8xWaJVju3mWGTefp40kPrgQ/g02HKwLGy8imBXtDpoSPGMx42yCL0B1ovkYqlQKhMLGEzxfb3cnIBUb+5Uua5VXYu/H9i9BFG58PpkvGAmnLBZdOBNQf+VvrZ/v6Pe6jBb0pNL8oJXL67NWVIMnE1Qt6ZnQmV2BuwbCZ7C28/Lt9B4xC0Ey//+1kxtEKrLaT3yl1x7L8fG4IIh0tZAmT5bbOHeB85SBtEIoFM3MYfn3ulRAuPQkjKYHb4yA4393naA8PbmsDVYHwdvHpaMu/DYl6WNTPBvy/x3yWIfwiuy+PN8A3wUw11Nj/Y/kpDXHUxhAqyGbuqGDhMi4PhRBfM13Ja5fktdNvvHxzmagxA5GC2OzditGWvCPb4EmbwaSQ9zPOG5XN5g6bnS3vxjTltG5jI/wWcxnUDU6eIPeCRhHKjIhxgqH/LAosEFZTbw8NLFElFZKRRH8BJ1U9tt0C+jBJJAVDzZKbejQjkkkkpCtFooip0lqGDdNeu5YE9uE5PZBzI7Jv1bacjxNrumIeO5R7UbdD2BYQBa6h17r8WSfOBFpGlnLoaMthcmlrfhT6iknghWYGW0cCTU8aLmI5ddVo X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2094acc3-f270-4212-97f6-08db2114bb9a X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2023 03:08:33.5601 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZF3qKpFoCdp8Y1cOgTgWMEzpWQyPPerO10Sv6KN8YUqa7+Iujlu0tp5sikcCDD7GXrLiHwF3eKvHCWoWhZtptQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4275 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED 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?1759949098090221920?= X-GMAIL-MSGID: =?utf-8?q?1759949098090221920?= Convert to use i_blocksize() for readability. Signed-off-by: Yangtao Li --- fs/ntfs3/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c index e9bdc1ff08c9..9d6ff29de441 100644 --- a/fs/ntfs3/file.c +++ b/fs/ntfs3/file.c @@ -178,7 +178,7 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to) { int err = 0; struct address_space *mapping = inode->i_mapping; - u32 blocksize = 1 << inode->i_blkbits; + u32 blocksize = i_blocksize(inode); pgoff_t idx = vbo >> PAGE_SHIFT; u32 from = vbo & (PAGE_SIZE - 1); pgoff_t idx_end = (vbo_to + PAGE_SIZE - 1) >> PAGE_SHIFT; @@ -192,7 +192,7 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to) page_off = (loff_t)idx << PAGE_SHIFT; to = (page_off + PAGE_SIZE) > vbo_to ? (vbo_to - page_off) : PAGE_SIZE; - iblock = page_off >> inode->i_blkbits; + iblock = page_off / i_blocksize(inode); page = find_or_create_page(mapping, idx, mapping_gfp_constraint(mapping,