diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-07 04:24:54 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-07 04:25:07 -0400 |
| commit | c99a444c5cc242a89845be83236aacd7db628ef5 (patch) | |
| tree | c4891accfde322013b94cc5dfd767184a1a8ccfb /libbcachefs/btree_write_buffer.c | |
| parent | 619c99de4be8f0618e7c4cb65039de2aa1e2536c (diff) | |
Update bcachefs sources to 25de2b00dc bcachefs: Change check for invalid key types
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/btree_write_buffer.c')
| -rw-r--r-- | libbcachefs/btree_write_buffer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libbcachefs/btree_write_buffer.c b/libbcachefs/btree_write_buffer.c index 8b7fffb2..3a3e36c1 100644 --- a/libbcachefs/btree_write_buffer.c +++ b/libbcachefs/btree_write_buffer.c @@ -213,6 +213,9 @@ slowpath: btree_write_buffered_journal_cmp, NULL); + commit_flags &= ~BCH_WATERMARK_MASK; + commit_flags |= BCH_WATERMARK_reclaim; + for (i = keys; i < keys + nr; i++) { if (!i->journal_seq) continue; @@ -231,8 +234,7 @@ slowpath: ret = commit_do(trans, NULL, NULL, commit_flags| BTREE_INSERT_NOFAIL| - BTREE_INSERT_JOURNAL_RECLAIM| - JOURNAL_WATERMARK_reserved, + BTREE_INSERT_JOURNAL_RECLAIM, __bch2_btree_insert(trans, i->btree, &i->k, 0)); if (bch2_fs_fatal_err_on(ret, c, "%s: insert error %s", __func__, bch2_err_str(ret))) break; |