From: Kent Overstreet Date: Sat, 31 May 2025 22:47:49 +0000 (-0400) Subject: bcachefs: Delete redundant fsck_err() X-Git-Tag: v6.16-rc1~48^2~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d47db3e63679541f4dd4696ce4661b6917cb9684;p=thirdparty%2Fkernel%2Flinux.git bcachefs: Delete redundant fsck_err() 'inode_has_wrong_backpointer'; we have more specific errors for every case afterwards. Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/inode.h b/fs/bcachefs/inode.h index 77ad2d5495417..82cec2836cbdd 100644 --- a/fs/bcachefs/inode.h +++ b/fs/bcachefs/inode.h @@ -283,15 +283,6 @@ static inline void bch2_inode_nlink_set(struct bch_inode_unpacked *bi, int bch2_inode_nlink_inc(struct bch_inode_unpacked *); void bch2_inode_nlink_dec(struct btree_trans *, struct bch_inode_unpacked *); -static inline bool bch2_inode_should_have_single_bp(struct bch_inode_unpacked *inode) -{ - bool inode_has_bp = inode->bi_dir || inode->bi_dir_offset; - - return S_ISDIR(inode->bi_mode) || - inode->bi_subvol || - (!inode->bi_nlink && inode_has_bp); -} - struct bch_opts bch2_inode_opts_to_opts(struct bch_inode_unpacked *); void bch2_inode_opts_get(struct bch_io_opts *, struct bch_fs *, struct bch_inode_unpacked *); diff --git a/fs/bcachefs/namei.c b/fs/bcachefs/namei.c index c57da4029d367..7ba3dee7eb2de 100644 --- a/fs/bcachefs/namei.c +++ b/fs/bcachefs/namei.c @@ -733,15 +733,6 @@ static int bch2_check_dirent_inode_dirent(struct btree_trans *trans, return __bch2_fsck_write_inode(trans, target); } - if (bch2_inode_should_have_single_bp(target) && - !fsck_err(trans, inode_wrong_backpointer, - "dirent points to inode that does not point back:\n%s", - (bch2_bkey_val_to_text(&buf, c, d.s_c), - prt_newline(&buf), - bch2_inode_unpacked_to_text(&buf, target), - buf.buf))) - goto err; - struct bkey_s_c_dirent bp_dirent = bch2_bkey_get_iter_typed(trans, &bp_iter, BTREE_ID_dirents, SPOS(target->bi_dir, target->bi_dir_offset, target->bi_snapshot),