diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-02-23 06:56:35 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:25 -0400 |
| commit | b66b2bc0f64a57c042ea1fa51dbd5904557bf67f (patch) | |
| tree | 104a7d90c38fc3fb4b634b6f18188698ebd4e228 /fs/bcachefs/journal_reclaim.c | |
| parent | e201f70b116513cb0d17ba32e1f00c234dee9d7e (diff) | |
| download | linux-b66b2bc0f64a57c042ea1fa51dbd5904557bf67f.tar.gz linux-b66b2bc0f64a57c042ea1fa51dbd5904557bf67f.tar.bz2 linux-b66b2bc0f64a57c042ea1fa51dbd5904557bf67f.zip | |
bcachefs: Revert "Ensure journal doesn't get stuck in nochanges mode"
This patch was originally to work around the journal geting stuck in
nochanges mode - but that was just a hack, we needed to fix the actual
bug. It should be fixed now, so revert it.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/journal_reclaim.c')
| -rw-r--r-- | fs/bcachefs/journal_reclaim.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/bcachefs/journal_reclaim.c b/fs/bcachefs/journal_reclaim.c index 84cc952a7ac5..c15b18831512 100644 --- a/fs/bcachefs/journal_reclaim.c +++ b/fs/bcachefs/journal_reclaim.c @@ -34,10 +34,8 @@ unsigned bch2_journal_dev_buckets_available(struct journal *j, struct journal_device *ja, enum journal_space_from from) { - unsigned available = !test_bit(JOURNAL_NOCHANGES, &j->flags) - ? ((journal_space_from(ja, from) - - ja->cur_idx - 1 + ja->nr) % ja->nr) - : ja->nr; + unsigned available = (journal_space_from(ja, from) - + ja->cur_idx - 1 + ja->nr) % ja->nr; /* * Don't use the last bucket unless writing the new last_seq |