diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-05 18:06:22 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-06 13:08:36 -0400 |
| commit | 15b24c732749339e3f65f030e7e68624b1b4bfbd (patch) | |
| tree | 4075d5327d264c74ff10046ae7bffdcb7b04893e /libbcachefs/bcachefs.h | |
| parent | caeeba5152cb0727b5a86222e615f6b777100a37 (diff) | |
Update bcachefs sources to 717b356d1d bcachefs: Convert journal validation to bkey_invalid_flags
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/bcachefs.h')
| -rw-r--r-- | libbcachefs/bcachefs.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/libbcachefs/bcachefs.h b/libbcachefs/bcachefs.h index e1f1e8e8..30b3d7b9 100644 --- a/libbcachefs/bcachefs.h +++ b/libbcachefs/bcachefs.h @@ -294,8 +294,8 @@ do { \ #define bch_err_fn(_c, _ret) \ bch_err(_c, "%s(): error %s", __func__, bch2_err_str(_ret)) -#define bch_err_msg(_c, _ret, _msg) \ - bch_err(_c, "%s(): error " _msg " %s", __func__, bch2_err_str(_ret)) +#define bch_err_msg(_c, _ret, _msg, ...) \ + bch_err(_c, "%s(): error " _msg " %s", __func__, ##__VA_ARGS__, bch2_err_str(_ret)) #define bch_verbose(c, fmt, ...) \ do { \ @@ -995,6 +995,7 @@ struct bch_fs { enum bch_recovery_pass curr_recovery_pass; /* bitmap of explicitly enabled recovery passes: */ u64 recovery_passes_explicit; + u64 recovery_passes_complete; /* DEBUG JUNK */ struct dentry *fs_debug_dir; @@ -1139,22 +1140,6 @@ static inline bool bch2_dev_exists2(const struct bch_fs *c, unsigned dev) return dev < c->sb.nr_devices && c->devs[dev]; } -/* - * For when we need to rewind recovery passes and run a pass we skipped: - */ -static inline int bch2_run_explicit_recovery_pass(struct bch_fs *c, - enum bch_recovery_pass pass) -{ - c->recovery_passes_explicit |= BIT_ULL(pass); - - if (c->curr_recovery_pass >= pass) { - c->curr_recovery_pass = pass; - return -BCH_ERR_restart_recovery; - } else { - return 0; - } -} - #define BKEY_PADDED_ONSTACK(key, pad) \ struct { struct bkey_i key; __u64 key ## _pad[pad]; } |