From ea57dd8d48ecd10414fbdfaf4f0338d3a017d2cb Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 10 Nov 2017 12:58:58 -0900 Subject: [PATCH] Update bcachefs sources to 58b77cfec6 bcachefs: improve btree_ptr_debugcheck() --- .bcachefs_revision | 2 +- libbcachefs/extents.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.bcachefs_revision b/.bcachefs_revision index 1e6e7905..3f7faac0 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -2679158d6e268d1bbcebda4f2000a24683ae06e0 +58b77cfec62e8cdf6c1f7863a5066356ab77e7ad diff --git a/libbcachefs/extents.c b/libbcachefs/extents.c index 7c641bda..742a9a00 100644 --- a/libbcachefs/extents.c +++ b/libbcachefs/extents.c @@ -620,7 +620,8 @@ static void btree_ptr_debugcheck(struct bch_fs *c, struct btree *b, do { seq = read_seqcount_begin(&c->gc_pos_lock); bad = gc_pos_cmp(c->gc_pos, gc_pos_btree_node(b)) > 0 && - g->mark.data_type != BUCKET_BTREE; + (g->mark.data_type != BUCKET_BTREE || + g->mark.dirty_sectors < c->opts.btree_node_size); } while (read_seqcount_retry(&c->gc_pos_lock, seq)); err = "inconsistent";