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 d763e8ab17 bcachefs: Don't lose needs_whiteout in overwrite path

Browse Source
This commit is contained in:
Kent Overstreet 2020-01-06 13:49:52 -05:00
parent 3046915927
commit ab2f1ec24f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
c9eb15545dce4f5490371afb92033082600473fe d763e8ab17ff1f5bdd9c5474ac15eb8791d31582

5
libbcachefs/btree_update_leaf.c
View File

@ -99,13 +99,14 @@ bool bch2_btree_bset_insert_key(struct btree_iter *iter,
} }
insert->k.needs_whiteout = k->needs_whiteout;
k->needs_whiteout = false;
if (k >= btree_bset_last(b)->start) { if (k >= btree_bset_last(b)->start) {
clobber_u64s = k->u64s; clobber_u64s = k->u64s;
goto overwrite; goto overwrite;
} }
insert->k.needs_whiteout = k->needs_whiteout;
k->needs_whiteout = false;
k->type = KEY_TYPE_deleted; k->type = KEY_TYPE_deleted;
/* /*
* XXX: we should be able to do this without two calls to * XXX: we should be able to do this without two calls to

3
libbcachefs/extents.c
View File

@ -228,7 +228,8 @@ void bch2_extent_debugcheck(struct bch_fs *c, struct bkey_s_c k)
struct extent_ptr_decoded p; struct extent_ptr_decoded p;
char buf[160]; char buf[160];
if (!test_bit(BCH_FS_INITIAL_GC_DONE, &c->flags)) if (!test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags) ||
!test_bit(BCH_FS_INITIAL_GC_DONE, &c->flags))
return; return;
if (!percpu_down_read_trylock(&c->mark_lock)) if (!percpu_down_read_trylock(&c->mark_lock))