diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-11-11 16:31:50 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-01-01 11:47:37 -0500 |
| commit | cb52d23e77a6e5e9588962ba7e283b0d0d2c1976 (patch) | |
| tree | 0ef5cb88faca56b5856ca8d76fe6ae615726038f /fs/bcachefs/recovery.c | |
| parent | 5927310dcfc9360ca7f8366b468ad52681bf5a27 (diff) | |
bcachefs: Rename BTREE_INSERT flags
BTREE_INSERT flags are actually transaction commit flags - rename them
for clarity.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/recovery.c')
| -rw-r--r-- | fs/bcachefs/recovery.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 88dbf11ba25d..5cbef7ad8cc8 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -175,9 +175,9 @@ static int bch2_journal_replay(struct bch_fs *c) /* Skip fastpath if we're low on space in the journal */ ret = c->journal.watermark ? -1 : commit_do(trans, NULL, NULL, - BTREE_INSERT_NOFAIL| - BTREE_INSERT_JOURNAL_RECLAIM| - (!k->allocated ? BTREE_INSERT_JOURNAL_REPLAY : 0), + BCH_TRANS_COMMIT_no_enospc| + BCH_TRANS_COMMIT_journal_reclaim| + (!k->allocated ? BCH_TRANS_COMMIT_no_journal_res : 0), bch2_journal_replay_key(trans, k)); BUG_ON(!ret && !k->overwritten); if (ret) { @@ -203,9 +203,9 @@ static int bch2_journal_replay(struct bch_fs *c) replay_now_at(j, k->journal_seq); ret = commit_do(trans, NULL, NULL, - BTREE_INSERT_NOFAIL| + BCH_TRANS_COMMIT_no_enospc| (!k->allocated - ? BTREE_INSERT_JOURNAL_REPLAY|BCH_WATERMARK_reclaim + ? BCH_TRANS_COMMIT_no_journal_res|BCH_WATERMARK_reclaim : 0), bch2_journal_replay_key(trans, k)); bch_err_msg(c, ret, "while replaying key at btree %s level %u:", @@ -506,7 +506,7 @@ err: noinline_for_stack static int bch2_fs_upgrade_for_subvolumes(struct bch_fs *c) { - int ret = bch2_trans_do(c, NULL, NULL, BTREE_INSERT_LAZY_RW, + int ret = bch2_trans_do(c, NULL, NULL, BCH_TRANS_COMMIT_lazy_rw, __bch2_fs_upgrade_for_subvolumes(trans)); if (ret) bch_err_fn(c, ret); |