From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 4B7F23DCD8A for ; Tue, 25 Aug 2026 22:05:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787695554; cv=none; b=jTFO68I5Ny0C+7/XfqGfVFaNUoxGotbWpxwJERSkffmC30/X7KY+WOa5ku+4zIRZNlS8lALVc000hFt6PoSqpLoVfdKHUvstNkr5BthzMrASiFe4DzLSNfRu9SprFj08s9vJ776fV/jM6kgsMVtlFof37LuJWXPW/tRvLYXj0GA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787695554; c=relaxed/simple; bh=ADEKyt27gkbFgpylnptsdDmcOriE5sbP+cLSOScIjfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S/tRdlQlGCavw1kafDdUlXp0LeB4NOGSuxei+Ktr03mtWYudMR7m+cPDZoQ1P9p3cpv3ATUKuxHezMHP5j5kkNxYxkWllsgqaDI6osHYho3bAl8beq063LVYbmy2k9YPNrQ6CJg4qprCcEvlZ+CYG67mVMLOkb3KP+ugvtEFZWM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fIImJ7/7; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fIImJ7/7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55C121F00A3A; Tue, 25 Aug 2026 22:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787695552; bh=CvA5hZSXfH7Eh0rK3BtakYp5IpPmxP8cyn0v+Lr/4GY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fIImJ7/7/ZGCkDS01AhM+sD3e0/+HOJgh3u8THDY7IMFH6B1LI1P+deiSfknGQwl3 ZaAcrDEfRLSHhBPkeheeNTxATKCd+uEcjb+lp4V1ydhyGU2L582T75mm9Rua4Um50u 1aGP/P/a4VDHuppHob3MfhleygPtM+ojdQG0zS+bilD22Aw1lQX7KAR2FRWecNY/0s xJWkCbhpJmF+gnaNMu0NyatxOPya5nyk5cPZeKNE4mMLBL0QZpXkhjMAzo8Ek8iItH uyFZYs0Dk1Viqb51/iZEnHaXGi8mkAC+fQU3MbX+D5749ZFawgir66EHcYm4yLn1Pq 0HM56nr8Cylug== From: Sasha Levin To: stable@vger.kernel.org Cc: Guanghui Yang <3497809730@qq.com>, Jan Kara , Theodore Ts'o , Sasha Levin Subject: [PATCH 6.6.y 3/3] ext4: propagate errors from fast commit range replay Date: Tue, 25 Aug 2026 18:05:49 -0400 Message-ID: <20260825220549.2781247-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260825220549.2781247-1-sashal@kernel.org> References: <2026082454-agent-feisty-8c0c@gregkh> <20260825220549.2781247-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Guanghui Yang <3497809730@qq.com> [ Upstream commit d8b8dd3530bf41e14b118702cdaf9de64bb96885 ] ext4_fc_replay() stops replaying fast commit tags only when a tag handler returns a negative error. However, ext4_fc_replay_add_range() and ext4_fc_replay_del_range() currently return 0 from their common exit paths even after internal failures. This hides errors from ext4_fc_record_modified_inode(), ext4_map_blocks(), ext4_find_extent(), ext4_ext_insert_extent(), ext4_ext_replay_update_ex(), and ext4_ext_remove_space(). As a result, a failed ADD_RANGE or DEL_RANGE replay can be treated as successful and the replay code may continue with subsequent fast commit tags. This is particularly problematic for DEL_RANGE because it may already have marked blocks as free before ext4_ext_remove_space() fails. If the error is swallowed, replay may continue from a partially applied range operation. Return the saved error from the common exit paths and make the ERR_PTR() cases in ADD_RANGE store PTR_ERR() before jumping to out. Fixes: 8016e29f4362 ("ext4: fast commit recovery path") Cc: stable@vger.kernel.org Signed-off-by: Guanghui Yang <3497809730@qq.com> Reviewed-by: Jan Kara Link: https://patch.msgid.link/tencent_E3622146846A84C75C31C7D32AC4D5AD0605@qq.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/fast_commit.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 3ee282c8d2481..4527f9eb9373c 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1799,8 +1799,11 @@ static int ext4_fc_replay_add_range(struct super_block *sb, if (ret == 0) { /* Range is not mapped */ path = ext4_find_extent(inode, cur, path, 0); - if (IS_ERR(path)) + if (IS_ERR(path)) { + ret = PTR_ERR(path); + path = NULL; goto out; + } memset(&newex, 0, sizeof(newex)); newex.ee_block = cpu_to_le32(cur); ext4_ext_store_pblock( @@ -1812,8 +1815,11 @@ static int ext4_fc_replay_add_range(struct super_block *sb, path = ext4_ext_insert_extent(NULL, inode, path, &newex, 0); up_write((&EXT4_I(inode)->i_data_sem)); - if (IS_ERR(path)) + if (IS_ERR(path)) { + ret = PTR_ERR(path); + path = NULL; goto out; + } goto next; } @@ -1860,10 +1866,11 @@ static int ext4_fc_replay_add_range(struct super_block *sb, } ext4_ext_replay_shrink_inode(inode, i_size_read(inode) >> sb->s_blocksize_bits); + ret = 0; out: ext4_free_ext_path(path); iput(inode); - return 0; + return ret; } /* Replay DEL_RANGE tag */ @@ -1924,9 +1931,10 @@ ext4_fc_replay_del_range(struct super_block *sb, ext4_ext_replay_shrink_inode(inode, i_size_read(inode) >> sb->s_blocksize_bits); ext4_mark_inode_dirty(NULL, inode); + ret = 0; out: iput(inode); - return 0; + return ret; } static void ext4_fc_set_bitmaps_and_counters(struct super_block *sb) -- 2.53.0