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

bcachefs: When fsck finds redundant snapshot keys, trigger snapshots cleanup

Browse Source 
Fsck now checks for keys in different snapshot IDs that are now
redundant due to other snapshots being deleted - it needs to for its own
algorithms to not get confused.

When it detects this it should re-run the post snapshot deletion cleanup
- this patch does that.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2022-07-16 23:21:15 -04:00 committed by Kent Overstreet
parent 35f1a5034d
commit c7a09cb1b1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/bcachefs/errcode.h
View File

@ -7,6 +7,7 @@ enum {
OPEN_BUCKETS_EMPTY = 2048, OPEN_BUCKETS_EMPTY = 2048,
FREELIST_EMPTY, /* Allocator thread not keeping up */ FREELIST_EMPTY, /* Allocator thread not keeping up */
INSUFFICIENT_DEVICES, INSUFFICIENT_DEVICES,
NEED_SNAPSHOT_CLEANUP,
}; };
#endif /* _BCACHFES_ERRCODE_H */ #endif /* _BCACHFES_ERRCODE_H */

13
fs/bcachefs/fsck.c
View File

@ -512,7 +512,7 @@ static int snapshots_seen_update(struct bch_fs *c, struct snapshots_seen *s,
bch2_btree_ids[btree_id], bch2_btree_ids[btree_id],
pos.inode, pos.offset, pos.inode, pos.offset,
i->id, n.id, n.equiv); i->id, n.id, n.equiv);
return -EINVAL; return -NEED_SNAPSHOT_CLEANUP;
} }
return 0; return 0;
@ -2388,7 +2388,9 @@ static int fix_reflink_p(struct bch_fs *c)
*/ */
int bch2_fsck_full(struct bch_fs *c) int bch2_fsck_full(struct bch_fs *c)
{ {
return bch2_fs_check_snapshots(c) ?: int ret;
again:
ret = bch2_fs_check_snapshots(c) ?:
bch2_fs_check_subvols(c) ?: bch2_fs_check_subvols(c) ?:
bch2_delete_dead_snapshots(c) ?: bch2_delete_dead_snapshots(c) ?:
check_inodes(c, true) ?: check_inodes(c, true) ?:
@ -2399,6 +2401,13 @@ int bch2_fsck_full(struct bch_fs *c)
check_directory_structure(c) ?: check_directory_structure(c) ?:
check_nlinks(c) ?: check_nlinks(c) ?:
fix_reflink_p(c); fix_reflink_p(c);
if (ret == -NEED_SNAPSHOT_CLEANUP) {
set_bit(BCH_FS_HAVE_DELETED_SNAPSHOTS, &c->flags);
goto again;
}
return ret;
} }
int bch2_fsck_walk_inodes_only(struct bch_fs *c) int bch2_fsck_walk_inodes_only(struct bch_fs *c)