From patchwork Fri Jan 12 19:41:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 187866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp584198dyc; Fri, 12 Jan 2024 19:58:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IHiN+WZovm70e0AxPNq7K9YfecapvW228Hf9UemAv3OiNzYNTdrS3b1h2CdMzrzf6SdV18/ X-Received: by 2002:a05:6870:7251:b0:206:89ae:d7e1 with SMTP id y17-20020a056870725100b0020689aed7e1mr2712418oaf.74.1705118313545; Fri, 12 Jan 2024 19:58:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705118313; cv=none; d=google.com; s=arc-20160816; b=ZZRUAecQo7Nhl5G8xANdh32L2Er7gfAqWn22Zg9V4waETzsTcNkYvPzZJIXbwmrJmq 3sIRhyMI7gi/Cxm8uCh/1dkKQapkWMFi2sp3sya7/LkeZLCNYSpefpSnS7iuuo0GPvdy K0pYT66X6gQDqP3/0SZ9PN9Txy9GS7rf99YqSAOxWZZqX62XeQJ2+SSok4CBl4DVd9ZC a1Pm8+JALALC7BrGjlpq1HZKCo+Ip5CLH9Q7cW3beUeWCtiBlIUW3TMAZqbCI0k8sG6O GTjoYBe6vtRBps+i23AU9hyuF4vHDtI0DAJQbNuPYpNJrYRfHfdy8OASAzaMHlwZbbSB 4veQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=BukD3JAQCP39cvO9gL9YjkxyctgLPkQmOkajwpajTt8=; fh=3gbPhre1OB9gPaTtmCq689W9XI462kLAqPsb9Z8n0A8=; b=OJnjxg8QfqaaPCWVex3KOQURAa/bzXsgqFpNkWBPreWkpjc+c4Xad4X98jXFiIWmaQ w1dVSaMhOQDwf80J3fbr7OXKFQLe6mQvGHKfyJUDqNYZh3nD/2lGCfC3FT/J6v1mRdCj 4R6aF3XQ5yY29hxF9TBLgEbOiMFswOCpBrU0d1h/aKtMgb+5YJ46Gl62RS0VfY9gbGCA 80+6xur+BtdLzmlHLK4GExS772WuUsrxw5xasWq5KLRJxqvMXRdZxyL9+iHLpS4VFDyF G25l8KdPvA7xQVxxBJbRuznz2XBlFNaN6cevKIwMsnmUwllfdirF/bOgVMDlWaHZoxMU ugnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=f7pX6qAv; spf=pass (google.com: domain of linux-kernel+bounces-25190-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25190-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id 17-20020a631051000000b005ce6a86685bsi4509797pgq.847.2024.01.12.19.58.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jan 2024 19:58:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-25190-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=f7pX6qAv; spf=pass (google.com: domain of linux-kernel+bounces-25190-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25190-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 043E4286F95 for ; Sat, 13 Jan 2024 03:58:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 91D8A1A726; Sat, 13 Jan 2024 03:57:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="f7pX6qAv" 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 001AE19454 for ; Sat, 13 Jan 2024 03:57:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 722A8C433A6; Sat, 13 Jan 2024 03:57:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705118248; bh=SD4fUAPJzN+uvRFc7mA/nW29W2wE766je65+7EHnk/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f7pX6qAv4QWcmyVcM0N8hs2jXBfnQxuaoTct/5CLyHPjilaqJZMFGK8SO9fQ4sLq/ ccW4m6q/ColKurPEwwFgqle55HWe1LeNVcIf+AZfN5BM48duRlLrN9tQ+PddLGzpP9 HVevzbToVs5KN8We5ANKc7Q50q+Dgtm7pRY3y2HlpTgGbB22RuaSNHin9JeIPKie8n g1+/ceNaZF5ZhfCUd5xofzEj8/gvMfX7gqyPcr5xpAa+4Bw0ImkN8yrFtfqLelugAC bt/wDSTrgI5ngPh1t6hXhTQMC5zo2KjZdDZ5pYFa5TTJEtWtcDHc2amWJjyPKaBXBV OfxZkxOp1oJig== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu , Daeho Jeong Subject: [PATCH v5 5/6] f2fs: fix to remove unnecessary f2fs_bug_on() to avoid panic Date: Sat, 13 Jan 2024 03:41:31 +0800 Message-Id: <20240112194132.25637-5-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240112194132.25637-1-chao@kernel.org> References: <20240112194132.25637-1-chao@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787946141133088291 X-GMAIL-MSGID: 1787946141133088291 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_blkaddr()") Reviewed-by: Daeho Jeong Signed-off-by: Chao Yu --- 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 69e71460a950..ab710bb6d8b3 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3470,11 +3470,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); - } } static inline bool __is_valid_data_blkaddr(block_t blkaddr)