diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-06-28 00:32:38 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:10:05 +0300 |
| commit | ec14fc6010fdcc40e54e289afc657a676ce93e72 (patch) | |
| tree | e8fba04ba538c638d926763706411559a43016a6 /fs/bcachefs/journal_types.h | |
| parent | 494036d862dfff1de9782492692da225479b7146 (diff) | |
| download | linux-ec14fc6010fdcc40e54e289afc657a676ce93e72.tar.xz | |
bcachefs: Kill JOURNAL_WATERMARK
This unifies JOURNAL_WATERMARK with BCH_WATERMARK; we're working towards
specifying watermarks once in the transaction commit path.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/journal_types.h')
| -rw-r--r-- | fs/bcachefs/journal_types.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/fs/bcachefs/journal_types.h b/fs/bcachefs/journal_types.h index 8d8c0b3d5a30..42504e16acb6 100644 --- a/fs/bcachefs/journal_types.h +++ b/fs/bcachefs/journal_types.h @@ -154,19 +154,6 @@ enum journal_flags { JOURNAL_NEED_FLUSH_WRITE, }; -#define JOURNAL_WATERMARKS() \ - x(any) \ - x(copygc) \ - x(reserved) - -enum journal_watermark { -#define x(n) JOURNAL_WATERMARK_##n, - JOURNAL_WATERMARKS() -#undef x -}; - -#define JOURNAL_WATERMARK_MASK 3 - /* Reasons we may fail to get a journal reservation: */ #define JOURNAL_ERRORS() \ x(ok) \ @@ -191,7 +178,7 @@ struct journal { struct { union journal_res_state reservations; - enum journal_watermark watermark; + enum bch_watermark watermark; union journal_preres_state prereserved; |