From:   Yangtao Li <frank.li@vivo.com>
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 <frank.li@vivo.com>
Subject: [PATCH 2/3] udf: use wrapper i_blocksize() in udf_discard_prealloc()
Date:   Fri, 10 Mar 2023 11:08:20 +0800
Message-Id: <20230310030821.66090-2-frank.li@vivo.com>
In-Reply-To: <20230310030821.66090-1-frank.li@vivo.com>
References: <20230310030821.66090-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8FPwq2CiB/Z9gdRKl+DlbHRyOYW6EWQwjvvm4AwxE/qk7yJivjINAQIr9mmL?=
 =?us-ascii?Q?jYTDbfRnQWfAuYS2VvP/R1iTtG4bi1/R+a/O2Q3PNeed7LJENtX7JUzH0WH7?=
 =?us-ascii?Q?bGzTHOvs34qbWmLfBUbBihmXIcicSLMl0Bm3JrTT5InTWywHX8p8zgC8hnll?=
 =?us-ascii?Q?TEsTPqJ3su5kXlLfnseN0BpVwkapx6UX2mqy9/C5NUgvnZowZ+bKYdGJN+91?=
 =?us-ascii?Q?NrJhuALwg1aM2knhmUQHftgMIGynGBX10nJt9NfdWbLYj4TS6EqWAn7HYsYH?=
 =?us-ascii?Q?q/YF/YNqll63FCeRl7nIuXsyCAxC6D/yc4DQ1HmgqIFVU0Lr6C8fpN6/hAMX?=
 =?us-ascii?Q?Pkm1+9ZU0exvTzbGNJQ6ovSmLGa9eFOMtVJ2mSqsnFYpi6npB5hzd6amC4jf?=
 =?us-ascii?Q?54NqtjSWW/ymhEMa3/t3zox00Rna6EKz+wXObyAvI0XTPOA1rDhhg4e4AXmG?=
 =?us-ascii?Q?osnSeZNjph7KEypky6gfOzo86c6uw96GfGon8VUERy5+M0HEb+XaOEHAg46n?=
 =?us-ascii?Q?hJwMOs24ykJHO7gRDobcGnknjbyrzYzzyp1dcl70vZr7VRFrZzZ7OsXtP7dQ?=
 =?us-ascii?Q?ty1UPsBPebeGGk8rHU3DvOZfW30h24C4ZrJDvkoluDljVT1OqGLJnxQhCtEB?=
 =?us-ascii?Q?WWzco3+QWcyVhaKqUr6jbnpLsGt3nAL2liwMOWNWT2psAUGk0RzzPLT/MGV3?=
 =?us-ascii?Q?Z2Y08WyJGELNvIqSxR4WTgFsKiBnXhh64HErnVi06bMtv0a9qlkuvXa5s1DK?=
 =?us-ascii?Q?5Vibylt2WbAok4qmbQIDr2wGdi3oYJ6hgwSxrg3OW1aakJCmTee/2wiRNoit?=
 =?us-ascii?Q?IoAMPMJ2QaD1t0rr9L6sRytTUDLKaYNuFYNavdEaFXB6016iaaWdadioqxtU?=
 =?us-ascii?Q?PvQo6gopyf68DuHoFOWqOhX8SRDaY6d3aeQQZJvwmmL9QA42RT3rhfSF7MlE?=
 =?us-ascii?Q?lwGax+GgOfushGuWgKR+Ht8FFkIxCSzw78WrSM2oZNk2zIPueIuv9q5UuPVp?=
 =?us-ascii?Q?Gt9QXZd47v70w9xhdnDs3tXQUBE1A0k41abjQBUo5fpuq0t95lKuZpz/yeYD?=
 =?us-ascii?Q?8Y7cN6VqcK2qcrgmqmvbUwsE32BbMyNqYdRBDq46pFSR0wSNRHc4MfMsHTHM?=
 =?us-ascii?Q?dmuvr6qayHbdtPNnA+YPUVCHhhKeHOyDVzNcBaZB5M7SKnsDP1HMVaVlw58W?=
 =?us-ascii?Q?2OV+7g5f3kxeaOjo6+yy0Eol8yGxpJK2jZ4/JNbIx44xCw6+w2k4GxzL+r/o?=
 =?us-ascii?Q?fBSsQb1AMYUIoWibfW/QpeJrP5x02XlXaKACUefuFem1QZ2dmRiA2tH4e8RP?=
 =?us-ascii?Q?33yzboTcgblzI/dcCooGQkxVXdhxqlxUrUVF4g1bsDxydenYe+daukUmlOdT?=
 =?us-ascii?Q?tD96gOMjZ0i06coKXk5m8ifiVigvFuv2Rg0IyUHmTHC7jeGeI+xNK+gpgENs?=
 =?us-ascii?Q?pa84Icz2VXtU3x2eiGQqNlSmFlwUmJC40pSLyg8/qWbNxU5bvkFQEOQHgdoV?=
 =?us-ascii?Q?rL7sCV5PRe9lOhLbAhGk21yeHtOgoafio99b7XnuGdAzA77Bz1BtVc4FEbK/?=
 =?us-ascii?Q?80kTjRn2YCvzDbcrFM6an1kNkTj0qLMR5LQDG1LD?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 37d3bb09-82d6-4e5d-42f9-08db2114bd1a
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:36.1390
 (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: Xx6N4k19eqFGLs5EP2n8fIbjOAs6cSlmzxFV/31OLsW+zLxaJuYJPpFW7xHMRdoRq8+QvkCJTbolzPtbSzK3og==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4275
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Convert to use i_blocksize() for readability.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/udf/truncate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
index 871856c69df5..2e7ba234bab8 100644
--- a/fs/udf/truncate.c
+++ b/fs/udf/truncate.c
@@ -127,7 +127,7 @@ void udf_discard_prealloc(struct inode *inode)
 	uint64_t lbcount = 0;
 	int8_t etype = -1;
 	struct udf_inode_info *iinfo = UDF_I(inode);
-	int bsize = 1 << inode->i_blkbits;
+	int bsize = i_blocksize(inode);
 
 	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB ||
 	    ALIGN(inode->i_size, bsize) == ALIGN(iinfo->i_lenExtents, bsize))
@@ -149,7 +149,7 @@ void udf_discard_prealloc(struct inode *inode)
 		lbcount -= elen;
 		udf_delete_aext(inode, prev_epos);
 		udf_free_blocks(inode->i_sb, inode, &eloc, 0,
-				DIV_ROUND_UP(elen, 1 << inode->i_blkbits));
+				DIV_ROUND_UP(elen, bsize));
 	}
 	/* This inode entry is in-memory only and thus we don't have to mark
 	 * the inode dirty */
-- 
2.25.1