bcachefs: If we run merges at a lower watermark, they must be nonblocking

Browse source

Fix another deadlock related to the merge path; previously, we switched
to always running merges at a lower watermark (because they are
noncritical); but when we run at a lower watermark we also need to run
nonblocking or we've introduced a new deadlock.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Reported-and-tested-by: s@m-h.ug

...

This commit is contained in:

Kent Overstreet 2024-04-21 23:32:18 -04:00

parent 0e42f38119

commit e858beeddf

1 changed files with 5 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

fs/bcachefs/btree_update_interior.c

View file