| commit | e858beeddfa3a400844c0e22d2118b3b52f1ea5e | [log] [tgz] |
|---|---|---|
| author | Kent Overstreet <kent.overstreet@linux.dev> | Sun Apr 21 23:32:18 2024 -0400 |
| committer | Kent Overstreet <kent.overstreet@linux.dev> | Mon Apr 22 01:26:51 2024 -0400 |
| tree | 1aa8a9b048af880fa769991e1355be23cd5cfe1d | |
| parent | 0e42f381193d7f9b47922f1c4308e7729a45ba13 [diff] |
bcachefs: If we run merges at a lower watermark, they must be nonblocking 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