iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Pass inode bkey to check_path()

Browse Source 
prep work for improving logging/error messages

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet
2024-02-08 22:52:40 -05:00
parent f5d58d0c72
commit 688a769409
2 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
fs/bcachefs/fsck.c
View File

@ -2105,51 +2105,51 @@ static int path_down(struct bch_fs *c, pathbuf *p,
* *
* XXX: we should also be verifying that inodes are in the right subvolumes * XXX: we should also be verifying that inodes are in the right subvolumes
*/ */
static int check_path(struct btree_trans *trans, static int check_path(struct btree_trans *trans, pathbuf *p, struct bkey_s_c inode_k)
pathbuf *p,
struct bch_inode_unpacked *inode,
u32 snapshot)
{ {
struct bch_fs *c = trans->c; struct bch_fs *c = trans->c;
struct bch_inode_unpacked inode;
u32 snapshot = bch2_snapshot_equiv(c, inode_k.k->p.snapshot);
int ret = 0; int ret = 0;
snapshot = bch2_snapshot_equiv(c, snapshot);
p->nr = 0; p->nr = 0;
while (!(inode->bi_inum == BCACHEFS_ROOT_INO && BUG_ON(bch2_inode_unpack(inode_k, &inode));
inode->bi_subvol == BCACHEFS_ROOT_SUBVOL)) {
while (!(inode.bi_inum == BCACHEFS_ROOT_INO &&
inode.bi_subvol == BCACHEFS_ROOT_SUBVOL)) {
struct btree_iter dirent_iter; struct btree_iter dirent_iter;
struct bkey_s_c_dirent d; struct bkey_s_c_dirent d;
u32 parent_snapshot = snapshot; u32 parent_snapshot = snapshot;
d = inode_get_dirent(trans, &dirent_iter, inode, &parent_snapshot); d = inode_get_dirent(trans, &dirent_iter, &inode, &parent_snapshot);
ret = bkey_err(d.s_c); ret = bkey_err(d.s_c);
if (ret && !bch2_err_matches(ret, ENOENT)) if (ret && !bch2_err_matches(ret, ENOENT))
break; break;
if (!ret && !dirent_points_to_inode(d, inode)) { if (!ret && !dirent_points_to_inode(d, &inode)) {
bch2_trans_iter_exit(trans, &dirent_iter); bch2_trans_iter_exit(trans, &dirent_iter);
ret = -BCH_ERR_ENOENT_dirent_doesnt_match_inode; ret = -BCH_ERR_ENOENT_dirent_doesnt_match_inode;
} }
if (bch2_err_matches(ret, ENOENT)) { if (bch2_err_matches(ret, ENOENT)) {
if (fsck_err(c, inode_unreachable, if (fsck_err(c, inode_unreachable,
"unreachable inode %llu:%u, type %s nlink %u backptr %llu:%llu", "unreachable inode %llu:%u, type %s nlink %u backptr %llu:%llu",
inode->bi_inum, snapshot, inode.bi_inum, snapshot,
bch2_d_type_str(inode_d_type(inode)), bch2_d_type_str(inode_d_type(&inode)),
inode->bi_nlink, inode.bi_nlink,
inode->bi_dir, inode.bi_dir,
inode->bi_dir_offset)) inode.bi_dir_offset))
ret = reattach_inode(trans, inode, snapshot); ret = reattach_inode(trans, &inode, snapshot);
break; break;
} }
bch2_trans_iter_exit(trans, &dirent_iter); bch2_trans_iter_exit(trans, &dirent_iter);
if (!S_ISDIR(inode->bi_mode)) if (!S_ISDIR(inode.bi_mode))
break; break;
ret = path_down(c, p, inode->bi_inum, snapshot); ret = path_down(c, p, inode.bi_inum, snapshot);
if (ret) { if (ret) {
bch_err(c, "memory allocation failure"); bch_err(c, "memory allocation failure");
return ret; return ret;
@ -2157,7 +2157,7 @@ static int check_path(struct btree_trans *trans,
snapshot = parent_snapshot; snapshot = parent_snapshot;
ret = lookup_inode(trans, inode->bi_dir, inode, &snapshot); ret = lookup_inode(trans, inode.bi_dir, &inode, &snapshot);
if (ret) { if (ret) {
/* Should have been caught in dirents pass */ /* Should have been caught in dirents pass */
if (!bch2_err_matches(ret, BCH_ERR_transaction_restart)) if (!bch2_err_matches(ret, BCH_ERR_transaction_restart))
@ -2165,26 +2165,26 @@ static int check_path(struct btree_trans *trans,
break; break;
} }
if (path_is_dup(p, inode->bi_inum, snapshot)) { if (path_is_dup(p, inode.bi_inum, snapshot)) {
/* XXX print path */ /* XXX print path */
bch_err(c, "directory structure loop"); bch_err(c, "directory structure loop");
darray_for_each(*p, i) darray_for_each(*p, i)
pr_err("%llu:%u", i->inum, i->snapshot); pr_err("%llu:%u", i->inum, i->snapshot);
pr_err("%llu:%u", inode->bi_inum, snapshot); pr_err("%llu:%u", inode.bi_inum, snapshot);
if (!fsck_err(c, dir_loop, "directory structure loop")) if (!fsck_err(c, dir_loop, "directory structure loop"))
return 0; return 0;
ret = remove_backpointer(trans, inode); ret = remove_backpointer(trans, &inode);
if (ret && !bch2_err_matches(ret, BCH_ERR_transaction_restart)) if (ret && !bch2_err_matches(ret, BCH_ERR_transaction_restart))
bch_err_msg(c, ret, "removing dirent"); bch_err_msg(c, ret, "removing dirent");
if (ret) if (ret)
break; break;
ret = reattach_inode(trans, inode, snapshot); ret = reattach_inode(trans, &inode, snapshot);
if (ret && !bch2_err_matches(ret, BCH_ERR_transaction_restart)) if (ret && !bch2_err_matches(ret, BCH_ERR_transaction_restart))
bch_err_msg(c, ret, "reattaching inode %llu", inode->bi_inum); bch_err_msg(c, ret, "reattaching inode %llu", inode.bi_inum);
break; break;
} }
} }
@ -2200,7 +2200,6 @@ fsck_err:
*/ */
int bch2_check_directory_structure(struct bch_fs *c) int bch2_check_directory_structure(struct bch_fs *c)
{ {
struct bch_inode_unpacked u;
pathbuf path = { 0, }; pathbuf path = { 0, };
int ret; int ret;
@ -2213,12 +2212,10 @@ int bch2_check_directory_structure(struct bch_fs *c)
if (!bkey_is_inode(k.k)) if (!bkey_is_inode(k.k))
continue; continue;
BUG_ON(bch2_inode_unpack(k, &u)); if (bch2_inode_flags(k) & BCH_INODE_unlinked)
if (u.bi_flags & BCH_INODE_unlinked)
continue; continue;
check_path(trans, &path, &u, iter.pos.snapshot); check_path(trans, &path, k);
}))); })));
darray_exit(&path); darray_exit(&path);

14
fs/bcachefs/inode.h
View File

@ -177,6 +177,20 @@ static inline u8 inode_d_type(struct bch_inode_unpacked *inode)
return inode->bi_subvol ? DT_SUBVOL : mode_to_type(inode->bi_mode); return inode->bi_subvol ? DT_SUBVOL : mode_to_type(inode->bi_mode);
} }
static inline u32 bch2_inode_flags(struct bkey_s_c k)
{
switch (k.k->type) {
case KEY_TYPE_inode:
return le32_to_cpu(bkey_s_c_to_inode(k).v->bi_flags);
case KEY_TYPE_inode_v2:
return le64_to_cpu(bkey_s_c_to_inode_v2(k).v->bi_flags);
case KEY_TYPE_inode_v3:
return le64_to_cpu(bkey_s_c_to_inode_v3(k).v->bi_flags);
default:
return 0;
}
}
/* i_nlink: */ /* i_nlink: */
static inline unsigned nlink_bias(umode_t mode) static inline unsigned nlink_bias(umode_t mode)