diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-04-03 16:47:22 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-04-03 17:34:02 -0400 |
| commit | 5639fb38cabaa326b8b664d874a46509d4a60bf2 (patch) | |
| tree | 3f3aa73ebc9505bede820ce02d7e8a9bad7dfa08 /libbcachefs/btree_trans_commit.c | |
| parent | 9f4ed5ce05888b62d1e4417323c553e5d06f4abf (diff) | |
Update bcachefs sources to 09d4c2acbf4c bcachefs: reconstruct_inode()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/btree_trans_commit.c')
| -rw-r--r-- | libbcachefs/btree_trans_commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libbcachefs/btree_trans_commit.c b/libbcachefs/btree_trans_commit.c index 96669fed..aa9da497 100644 --- a/libbcachefs/btree_trans_commit.c +++ b/libbcachefs/btree_trans_commit.c @@ -887,6 +887,7 @@ int bch2_trans_commit_error(struct btree_trans *trans, unsigned flags, int ret, unsigned long trace_ip) { struct bch_fs *c = trans->c; + enum bch_watermark watermark = flags & BCH_WATERMARK_MASK; switch (ret) { case -BCH_ERR_btree_insert_btree_node_full: @@ -905,7 +906,7 @@ int bch2_trans_commit_error(struct btree_trans *trans, unsigned flags, * flag */ if ((flags & BCH_TRANS_COMMIT_journal_reclaim) && - (flags & BCH_WATERMARK_MASK) != BCH_WATERMARK_reclaim) { + watermark < BCH_WATERMARK_reclaim) { ret = -BCH_ERR_journal_reclaim_would_deadlock; break; } |