From nobody Mon Feb 9 01:27:16 2026 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 8223A218538; Sun, 24 Mar 2024 23:09:49 +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=1711321789; cv=none; b=CGTQWzO0rXcN6iIPN6oUy5oQGBzXdrytLdNAquMGmAn/gkEKubBe6AqN0MzTdNNAHl957+VXvcUta8BN2QGYIb44etozaZWzwjCHRB05ZjK8mz682VDZ4LkAEZ5lArMSnXlUDNO8ykrSdx6/pWlKqs1FtWlbsEE7qqDfd9K/yug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321789; c=relaxed/simple; bh=9VqlHXKMnFlXG02wYOr54FZmu6yF+7WTnK+ViQ0gdOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jppXNIaeZSUY/9fpPBrQ+vOtRcujvgbwJLY0p5r+OjUr8Zjsj3mYoKp0nkLQX8FG/1BcjGeEDeoWc/elj9z2oAKTu14OXlLn8fNjHnx9WsRFMcuLVNW9AP2f3hdq5Isf9rPvJ/26XVDi7eoBpzVHbFgBfFcSegJRDXGG8YwxtQY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SJw427EJ; 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="SJw427EJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7B32C43394; Sun, 24 Mar 2024 23:09:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321789; bh=9VqlHXKMnFlXG02wYOr54FZmu6yF+7WTnK+ViQ0gdOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SJw427EJ/cSxKEzJSQfuQwMnvdzDsQDUDU8sfmFEzz3Z/pYUZS4F+Z8yE+oo04+WL 3EsL9VuQvhvVVQrmagsf8IPJMasDpCLf+fbaDCLJfeDX1HmGvbMrjG68Mj6PxFDnbR Tlx4Zj35t5XCF/5t+SpEv3cOFnIYkl0MFK5dpWeMptfJ8/mbhQ1s8Sx9CebnU9Xq1T CfFBYEPRA1K+a/SNUtVx7Gn7mEg52Pm/7jS3A2CG/+n5JeukRxqxMv8finJJJB6uPZ REmU7dfS+Ab1+z27q8NEtGYhnZssj+qxVxtf0FI9T/3ydl+Pb6PmTfjVbKEcdM962m EWYDkYmCSdyIw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chao Yu , Daeho Jeong , Jaegeuk Kim , Sasha Levin Subject: [PATCH 6.6 517/638] f2fs: fix to remove unnecessary f2fs_bug_on() to avoid panic Date: Sun, 24 Mar 2024 18:59:14 -0400 Message-ID: <20240324230116.1348576-518-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Chao Yu [ Upstream commit b896e302f79678451a94769ddd9e52e954c64fbb ] verify_blkaddr() will trigger panic once we inject fault into f2fs_is_valid_blkaddr(), fix to remove this unnecessary f2fs_bug_on(). Fixes: 18792e64c86d ("f2fs: support fault injection for f2fs_is_valid_blkad= dr()") Reviewed-by: Daeho Jeong Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/f2fs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 8e5df06e9bb2c..2e2792a49de0f 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3460,11 +3460,9 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, static inline void verify_blkaddr(struct f2fs_sb_info *sbi, block_t blkaddr, int type) { - if (!f2fs_is_valid_blkaddr(sbi, blkaddr, type)) { + if (!f2fs_is_valid_blkaddr(sbi, blkaddr, type)) f2fs_err(sbi, "invalid blkaddr: %u, type: %d, run fsck to fix.", blkaddr, type); - f2fs_bug_on(sbi, 1); - } } =20 static inline bool __is_valid_data_blkaddr(block_t blkaddr) --=20 2.43.0