alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update bcachefs sources to a7694865a3 bcachefs: fsck: Another transaction restart handling fix

Browse Source
This commit is contained in:
Kent Overstreet 2022-08-18 18:00:01 -04:00
parent c4ddc63aec
commit d2c2c5954c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
3421116a6c137a36963cfe93c485f48ccd8802b9 a7694865a3008d6752370caee2ed3c64c1b0f973

10
libbcachefs/fsck.c
View File

@ -728,7 +728,7 @@ static int __get_visible_inodes(struct btree_trans *trans,
w->inodes.nr = 0; w->inodes.nr = 0;
for_each_btree_key(trans, iter, BTREE_ID_inodes, POS(0, inum), for_each_btree_key_norestart(trans, iter, BTREE_ID_inodes, POS(0, inum),
BTREE_ITER_ALL_SNAPSHOTS, k, ret) { BTREE_ITER_ALL_SNAPSHOTS, k, ret) {
u32 equiv = bch2_snapshot_equiv(c, k.k->p.snapshot); u32 equiv = bch2_snapshot_equiv(c, k.k->p.snapshot);
@ -1372,14 +1372,12 @@ static int check_subdir_count(struct btree_trans *trans, struct inode_walker *w)
} }
} }
fsck_err: fsck_err:
if (ret) { if (ret)
bch_err(c, "error from check_subdir_count(): %s", bch2_err_str(ret)); bch_err(c, "error from check_subdir_count(): %s", bch2_err_str(ret));
if (!ret && trans_was_restarted(trans, restart_count))
ret = -BCH_ERR_transaction_restart_nested;
return ret; return ret;
} }
if (trans_was_restarted(trans, restart_count))
return -BCH_ERR_transaction_restart_nested;
return 0;
}
static int check_dirent_target(struct btree_trans *trans, static int check_dirent_target(struct btree_trans *trans,
struct btree_iter *iter, struct btree_iter *iter,