diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2025-01-23 14:02:44 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-02-07 14:50:26 -0500 |
| commit | e4fa98a7e74f46afd28b663b4567af3d78309f74 (patch) | |
| tree | 86d0b3f82e5073e4e92db281bf291fac5a0575b6 | |
| parent | b325d0a9b1aac289056ab956fa09e5255e74f47d (diff) | |
bcachefs: Kill journal_res.idx
More dead code.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/journal.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/journal.h | 11 | ||||
| -rw-r--r-- | fs/bcachefs/journal_types.h | 1 |
3 files changed, 7 insertions, 7 deletions
diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c index da64a73704ff..20b748f61b21 100644 --- a/fs/bcachefs/journal.c +++ b/fs/bcachefs/journal.c @@ -306,7 +306,7 @@ static void __journal_entry_close(struct journal *j, unsigned closed_val, bool t bch2_journal_space_available(j); - __bch2_journal_buf_put(j, old.idx, le64_to_cpu(buf->data->seq)); + __bch2_journal_buf_put(j, le64_to_cpu(buf->data->seq)); } void bch2_journal_halt(struct journal *j) diff --git a/fs/bcachefs/journal.h b/fs/bcachefs/journal.h index 107f7f901cd9..1e5fcfe3624a 100644 --- a/fs/bcachefs/journal.h +++ b/fs/bcachefs/journal.h @@ -193,7 +193,7 @@ bch2_journal_add_entry_noreservation(struct journal_buf *buf, size_t u64s) static inline struct jset_entry * journal_res_entry(struct journal *j, struct journal_res *res) { - return vstruct_idx(j->buf[res->idx].data, res->offset); + return vstruct_idx(j->buf[res->seq & JOURNAL_BUF_MASK].data, res->offset); } static inline unsigned journal_entry_init(struct jset_entry *entry, unsigned type, @@ -267,8 +267,9 @@ bool bch2_journal_entry_close(struct journal *); void bch2_journal_do_writes(struct journal *); void bch2_journal_buf_put_final(struct journal *, u64); -static inline void __bch2_journal_buf_put(struct journal *j, unsigned idx, u64 seq) +static inline void __bch2_journal_buf_put(struct journal *j, u64 seq) { + unsigned idx = seq & JOURNAL_BUF_MASK; union journal_res_state s; s = journal_state_buf_put(j, idx); @@ -276,8 +277,9 @@ static inline void __bch2_journal_buf_put(struct journal *j, unsigned idx, u64 s bch2_journal_buf_put_final(j, seq); } -static inline void bch2_journal_buf_put(struct journal *j, unsigned idx, u64 seq) +static inline void bch2_journal_buf_put(struct journal *j, u64 seq) { + unsigned idx = seq & JOURNAL_BUF_MASK; union journal_res_state s; s = journal_state_buf_put(j, idx); @@ -306,7 +308,7 @@ static inline void bch2_journal_res_put(struct journal *j, BCH_JSET_ENTRY_btree_keys, 0, 0, 0); - bch2_journal_buf_put(j, res->idx, res->seq); + bch2_journal_buf_put(j, res->seq); res->ref = 0; } @@ -361,7 +363,6 @@ static inline int journal_res_get_fast(struct journal *j, &old.v, new.v)); res->ref = true; - res->idx = old.idx; res->offset = old.cur_entry_offset; res->seq = le64_to_cpu(j->buf[old.idx].data->seq); return 1; diff --git a/fs/bcachefs/journal_types.h b/fs/bcachefs/journal_types.h index e38a3d93b17d..6a098c7e3f2e 100644 --- a/fs/bcachefs/journal_types.h +++ b/fs/bcachefs/journal_types.h @@ -79,7 +79,6 @@ struct journal_entry_pin { struct journal_res { bool ref; - u8 idx; u16 u64s; u32 offset; u64 seq; |