| Message ID | 20240111064208.2969599-5-chao@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [f2fs-dev,v4,1/6] f2fs: compress: fix to guarantee persisting compressed blocks by CP | expand |
Reviewed-by: Daeho Jeong <daehojeong@google.com> On Wed, Jan 10, 2024 at 10:43 PM Chao Yu <chao@kernel.org> wrote: > > 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()") > Signed-off-by: Chao Yu <chao@kernel.org> > --- > 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) > -- > 2.40.1 > > > > _______________________________________________ > Linux-f2fs-devel mailing list > Linux-f2fs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
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)
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()") Signed-off-by: Chao Yu <chao@kernel.org> --- fs/f2fs/f2fs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)