diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-10 12:23:51 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-10 12:34:08 -0400 |
| commit | 73bf371f4c2b7b5323cef9b6813fc813ac9d385b (patch) | |
| tree | a8c48419d70b8583eaf4c9fec393e8aab80298f7 /libbcachefs/btree_update_leaf.c | |
| parent | ffa950ce1d59344ff621659b845416b8a526127f (diff) | |
Update bcachefs sources to fb39031ade bcachefs: bch2_sb_maybe_downgrade(), bch2_sb_upgrade()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/btree_update_leaf.c')
| -rw-r--r-- | libbcachefs/btree_update_leaf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libbcachefs/btree_update_leaf.c b/libbcachefs/btree_update_leaf.c index 6e12e8e7..53219fdc 100644 --- a/libbcachefs/btree_update_leaf.c +++ b/libbcachefs/btree_update_leaf.c @@ -958,6 +958,10 @@ int bch2_trans_commit_error(struct btree_trans *trans, unsigned flags, bch2_replicas_delta_list_mark(c, trans->fs_usage_deltas)); break; case -BCH_ERR_journal_res_get_blocked: + /* + * XXX: this should probably be a separate BTREE_INSERT_NONBLOCK + * flag + */ if ((flags & BTREE_INSERT_JOURNAL_RECLAIM) && (flags & BCH_WATERMARK_MASK) != BCH_WATERMARK_reclaim) { ret = -BCH_ERR_journal_reclaim_would_deadlock; |