From: Adarsh Das Date: Fri, 6 Feb 2026 12:56:38 +0000 (+0530) Subject: fs: udf: avoid assignment in condition when selecting allocation goal X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=937c262d4f55e472f5bd66cf8a293f20da2616f4;p=thirdparty%2Fkernel%2Fstable.git fs: udf: avoid assignment in condition when selecting allocation goal Avoid assignment inside an if condition when choosing the block allocation goal in inode_getblk(), and make the priority order explicit. No functional change. [JK: Fixup conditions to really not change functionality] Signed-off-by: Adarsh Das Link: https://patch.msgid.link/20260206125638.94194-1-adarshdas950@gmail.com Signed-off-by: Jan Kara --- diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 7fae8002344a0..c766a805f9b9a 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -734,7 +734,7 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map) sector_t offset = 0; int8_t etype, tmpetype; struct udf_inode_info *iinfo = UDF_I(inode); - udf_pblk_t goal = 0, pgoal = iinfo->i_location.logicalBlockNum; + udf_pblk_t goal = 0, pgoal = 0; int lastblock = 0; bool isBeyondEOF = false; int ret = 0; @@ -893,11 +893,10 @@ static int inode_getblk(struct inode *inode, struct udf_map_rq *map) else { /* otherwise, allocate a new block */ if (iinfo->i_next_alloc_block == map->lblk) goal = iinfo->i_next_alloc_goal; - - if (!goal) { - if (!(goal = pgoal)) /* XXX: what was intended here? */ - goal = iinfo->i_location.logicalBlockNum + 1; - } + if (!goal) + goal = pgoal; + if (!goal) + goal = iinfo->i_location.logicalBlockNum + 1; newblocknum = udf_new_block(inode->i_sb, inode, iinfo->i_location.partitionReferenceNum,