diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-21 02:10:28 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-21 02:13:02 -0400 |
| commit | 74148a8ee52526c44752f1773365963f18734ac9 (patch) | |
| tree | 25ccc19dab308fedcfb3fabdc955ecca2d2dc542 /libbcachefs/journal_reclaim.c | |
| parent | e76dbf1abd4472fa26c85f4b30e213d8768ccf64 (diff) | |
Update bcachefs sources to 0e705f5944 fixup! bcachefs: Refactor bch2_btree_node_mem_alloc()
Diffstat (limited to 'libbcachefs/journal_reclaim.c')
| -rw-r--r-- | libbcachefs/journal_reclaim.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libbcachefs/journal_reclaim.c b/libbcachefs/journal_reclaim.c index a920a111..6f1bad52 100644 --- a/libbcachefs/journal_reclaim.c +++ b/libbcachefs/journal_reclaim.c @@ -195,7 +195,7 @@ void bch2_journal_space_available(struct journal *j) j->can_discard = can_discard; if (nr_online < c->opts.metadata_replicas_required) { - ret = cur_entry_insufficient_devices; + ret = JOURNAL_ERR_insufficient_devices; goto out; } @@ -217,9 +217,9 @@ void bch2_journal_space_available(struct journal *j) printbuf_exit(&buf); bch2_fatal_error(c); - ret = cur_entry_journal_stuck; + ret = JOURNAL_ERR_journal_stuck; } else if (!j->space[journal_space_discarded].next_entry) - ret = cur_entry_journal_full; + ret = JOURNAL_ERR_journal_full; if ((j->space[journal_space_clean_ondisk].next_entry < j->space[journal_space_clean_ondisk].total) && @@ -238,7 +238,7 @@ out: j->cur_entry_sectors = !ret ? j->space[journal_space_discarded].next_entry : 0; j->cur_entry_error = ret; journal_set_remaining(j, u64s_remaining); - journal_check_may_get_unreserved(j); + journal_set_watermark(j); if (!ret) journal_wake(j); |