diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 21:56:27 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 22:03:31 -0400 |
| commit | 19005ecf086b1067362d907c185298d3a43e67e4 (patch) | |
| tree | 625f189f5ff1f425f43dac49f574533652688acf /libbcachefs/extents.c | |
| parent | 2ab2ab0f781ae750473763e8a042c900a982d399 (diff) | |
Update bcachefs sources to defaad6d47 bcachefs: Fix an assertion when rebuilding replicas
Diffstat (limited to 'libbcachefs/extents.c')
| -rw-r--r-- | libbcachefs/extents.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libbcachefs/extents.c b/libbcachefs/extents.c index 6eaa89c9..ef36d244 100644 --- a/libbcachefs/extents.c +++ b/libbcachefs/extents.c @@ -679,7 +679,8 @@ void bch2_btree_ptr_debugcheck(struct bch_fs *c, struct btree *b, goto err; } - if (!bch2_bkey_replicas_marked(c, btree_node_type(b), e.s_c)) { + if (!test_bit(BCH_FS_REBUILD_REPLICAS, &c->flags) && + !bch2_bkey_replicas_marked(c, btree_node_type(b), e.s_c)) { bch2_bkey_val_to_text(c, btree_node_type(b), buf, sizeof(buf), k); bch2_fs_bug(c, @@ -1713,7 +1714,8 @@ static void bch2_extent_debugcheck_extent(struct bch_fs *c, struct btree *b, return; } - if (!bch2_bkey_replicas_marked(c, btree_node_type(b), e.s_c)) { + if (!test_bit(BCH_FS_REBUILD_REPLICAS, &c->flags) && + !bch2_bkey_replicas_marked(c, btree_node_type(b), e.s_c)) { bch2_bkey_val_to_text(c, btree_node_type(b), buf, sizeof(buf), e.s_c); bch2_fs_bug(c, |