diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-08-27 19:37:05 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:39 +0300 |
| commit | d97e6aaed60a9c2c727cce2979ca311fe232163f (patch) | |
| tree | c408db16556e241c681e8f816c14e397903961b2 | |
| parent | 8a9c1b1cb0edacdf4ac9c378c4ec4fc376fc8bac (diff) | |
| download | linux-d97e6aaed60a9c2c727cce2979ca311fe232163f.tar.xz | |
bcachefs: Fix bch2_btree_update_start() to return -BCH_ERR_journal_reclaim_would_deadlock
On failure to get a journal pre-reservation because we're called from
journal reclaim we're not supposed to return a transaction restart error
- this fixes a livelock.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index fc768195be54..dd9405c631f5 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -1049,6 +1049,11 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path, if (ret) { bch2_trans_unlock(trans); + if (flags & BTREE_INSERT_JOURNAL_RECLAIM) { + ret = -BCH_ERR_journal_reclaim_would_deadlock; + goto err; + } + ret = bch2_journal_preres_get(&c->journal, &as->journal_preres, BTREE_UPDATE_JOURNAL_RES, journal_flags); |