From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 797A821257E for ; Wed, 25 Feb 2026 01:58:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771984694; cv=none; b=NvqO4RBMQR+Hl5onu8+AaV9Az11MaXLG+2w1kQhfR1vZdos8cRpjS+uxV/TyQN6i9BT6EeUQL3hDjaDr9NP4h24zTIhkXaWyNCypukoCeI8w8zcTZgUMU/g751RhFm7nrI0b2coY7jrJ9GXmIQFzUWXsPQqKq9DQM1tSKWylkSo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771984694; c=relaxed/simple; bh=+Wog90o4pOqSfp7X7/ITVQijS7ydBmsWDfJZxNAKwcI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FtqFm/L2hazC4hMllAAI+gLVYCp9qDdP8+CdQYjZVUk3lSMZNsuMfLUyJS/IsER9LXggcrYNoKGMYarUqNwcNP1XPiFbfnGCWDym7ph82IOYRGI9AdYpu8EUB6L0JXywzHV19oTtGiDtuMTnGAHY7+R6YdSZs9pp898+7A3BGsk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lVmMRU/Q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lVmMRU/Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91156C116D0; Wed, 25 Feb 2026 01:58:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771984694; bh=+Wog90o4pOqSfp7X7/ITVQijS7ydBmsWDfJZxNAKwcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lVmMRU/QJG0t3dxyxtPjHF3m69WqQmof0mWUFPTBP7bz8rqmmbiVW3ujoVOOOKf6Y DgYXsWttebqWUc2ovcTxQrFlpMQ66Qpc/rE7PMYoAVa658/NZMg8PNfZyniPRVN+hG /AGz1xtNJCrDkykrEblRH7uITTjrwEKRYHu2jdy9mADUaBJeefugQ4lQZRtR3qDaDN wOe+iwZMiePg2/G6s1cgq0aZijfdQgtOHi8TfyyZCxjS7AQdVeG/ppOCVQbQvjhxfX AwWI73gBT2PomhOhDQAGnqJlrRIOv6QK7l7p2Tjfaim2AYYEYeRpcXtDEu0FxFyzXp nJR1XPELIJUjg== From: Sasha Levin To: stable@vger.kernel.org Cc: Yang Erkun , Theodore Ts'o , Sasha Levin Subject: [PATCH 6.12.y 1/3] ext4: correct the comments place for EXT4_EXT_MAY_ZEROOUT Date: Tue, 24 Feb 2026 20:58:09 -0500 Message-ID: <20260225015811.3777135-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026022419-bonsai-gorged-49c6@gregkh> References: <2026022419-bonsai-gorged-49c6@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yang Erkun [ Upstream commit cc742fd1d184bb2a11bacf50587d2c85290622e4 ] Move the comments just before we set EXT4_EXT_MAY_ZEROOUT in ext4_split_convert_extents. Signed-off-by: Yang Erkun Message-ID: <20251112084538.1658232-4-yangerkun@huawei.com> Signed-off-by: Theodore Ts'o Stable-dep-of: feaf2a80e78f ("ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O") Signed-off-by: Sasha Levin --- fs/ext4/extents.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 2f9c3cd4f26cc..35c6511c4a753 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3719,10 +3719,6 @@ static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle, >> inode->i_sb->s_blocksize_bits; if (eof_block < map->m_lblk + map->m_len) eof_block = map->m_lblk + map->m_len; - /* - * It is safe to convert extent to initialized via explicit - * zeroout only if extent is fully inside i_size or new_size. - */ depth = ext_depth(inode); ex = path[depth].p_ext; ee_block = le32_to_cpu(ex->ee_block); @@ -3733,6 +3729,10 @@ static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle, split_flag |= EXT4_EXT_DATA_VALID1; /* Convert to initialized */ } else if (flags & EXT4_GET_BLOCKS_CONVERT) { + /* + * It is safe to convert extent to initialized via explicit + * zeroout only if extent is fully inside i_size or new_size. + */ split_flag |= ee_block + ee_len <= eof_block ? EXT4_EXT_MAY_ZEROOUT : 0; split_flag |= (EXT4_EXT_MARK_UNWRIT2 | EXT4_EXT_DATA_VALID2); -- 2.51.0