diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-04-25 14:32:39 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-12 19:42:33 -0400 |
| commit | a0a33e65e3a1f2ee282ef24fea0f2999b978456e (patch) | |
| tree | d2eea23ed8127b8b12afce5bf0455c1f7de0f8f6 | |
| parent | 5eb0cabd860163fe387cac33518769d56302324c (diff) | |
bcachefs: Make sure hash info gets initialized in fsck
We had some bugs with setting/using first_this_inode in the inode
walker in the dirents/xattr code.
This patch changes to not clear first_this_inode until after
initializing the new hash info.
Also, we fix an error message to not print on transaction restart, and
add a comment to related fsck error code.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/error.c | 5 | ||||
| -rw-r--r-- | fs/bcachefs/fsck.c | 25 |
2 files changed, 17 insertions, 13 deletions
diff --git a/fs/bcachefs/error.c b/fs/bcachefs/error.c index aa640284ed19..545c55dabc27 100644 --- a/fs/bcachefs/error.c +++ b/fs/bcachefs/error.c @@ -158,6 +158,11 @@ int bch2_fsck_err(struct bch_fs *c, unsigned flags, const char *fmt, ...) mutex_lock(&c->fsck_error_lock); s = fsck_err_get(c, fmt); if (s) { + /* + * We may be called multiple times for the same error on + * transaction restart - this memoizes instead of asking the user + * multiple times for the same error: + */ if (s->last_msg && !strcmp(buf.buf, s->last_msg)) { ret = s->ret; mutex_unlock(&c->fsck_error_lock); diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c index 6319f2f7b16f..4e7100577734 100644 --- a/fs/bcachefs/fsck.c +++ b/fs/bcachefs/fsck.c @@ -673,10 +673,8 @@ static int __walk_inode(struct btree_trans *trans, pos.snapshot = bch2_snapshot_equiv(c, pos.snapshot); - if (pos.inode == w->cur_inum) { - w->first_this_inode = false; + if (pos.inode == w->cur_inum) goto lookup_snapshot; - } w->inodes.nr = 0; @@ -862,10 +860,10 @@ bad_hash: (printbuf_reset(&buf), bch2_bkey_val_to_text(&buf, c, hash_k), buf.buf))) { ret = hash_redo_key(trans, desc, hash_info, k_iter, hash_k); - if (ret) { + if (ret && !bch2_err_matches(ret, BCH_ERR_transaction_restart)) bch_err(c, "hash_redo_key err %s", bch2_err_str(ret)); + if (ret) return ret; - } ret = -BCH_ERR_transaction_restart_nested; } fsck_err: @@ -1639,6 +1637,10 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter, if (ret < 0) goto err; + if (dir->first_this_inode) + *hash_info = bch2_hash_info_init(c, &dir->inodes.data[0].inode); + dir->first_this_inode = false; + if (fsck_err_on(ret == INT_MAX, c, "dirent in nonexisting directory:\n%s", (printbuf_reset(&buf), @@ -1665,11 +1667,7 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter, goto out; } - if (dir->first_this_inode) - *hash_info = bch2_hash_info_init(c, &dir->inodes.data[0].inode); - - ret = hash_check_key(trans, bch2_dirent_hash_desc, - hash_info, iter, k); + ret = hash_check_key(trans, bch2_dirent_hash_desc, hash_info, iter, k); if (ret < 0) goto err; if (ret) { @@ -1822,6 +1820,10 @@ static int check_xattr(struct btree_trans *trans, struct btree_iter *iter, if (ret < 0) return ret; + if (inode->first_this_inode) + *hash_info = bch2_hash_info_init(c, &inode->inodes.data[0].inode); + inode->first_this_inode = false; + if (fsck_err_on(ret == INT_MAX, c, "xattr for missing inode %llu", k.k->p.inode)) @@ -1832,9 +1834,6 @@ static int check_xattr(struct btree_trans *trans, struct btree_iter *iter, ret = 0; - if (inode->first_this_inode) - *hash_info = bch2_hash_info_init(c, &inode->inodes.data[0].inode); - ret = hash_check_key(trans, bch2_xattr_hash_desc, hash_info, iter, k); fsck_err: if (ret && !bch2_err_matches(ret, BCH_ERR_transaction_restart)) |