diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-30 22:21:11 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-01-06 19:47:56 -0500 |
| commit | 8e057d1cbc892d1ad81cce80ab7c04c0db4db41b (patch) | |
| tree | ca2f65d1a1f235c6ae29891760935187f62885e7 | |
| parent | deac1dba4ba8203ddacaf2535e3e432bfff1214e (diff) | |
bcachefs: Kill BCH_WRITE_JOURNAL_SEQ_PTR
Dead code, delete.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/data_update.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/io.c | 4 | ||||
| -rw-r--r-- | fs/bcachefs/io.h | 8 | ||||
| -rw-r--r-- | fs/bcachefs/io_types.h | 9 |
4 files changed, 4 insertions, 19 deletions
diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c index d7a8c8902a2e..d304c6cf77c6 100644 --- a/fs/bcachefs/data_update.c +++ b/fs/bcachefs/data_update.c @@ -225,7 +225,7 @@ int bch2_data_update_index_update(struct bch_write_op *op) bch2_trans_update(&trans, &iter, insert, BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) ?: bch2_trans_commit(&trans, &op->res, - op_journal_seq(op), + &op->journal_seq, BTREE_INSERT_NOFAIL| m->data_opts.btree_insert_flags); if (!ret) { diff --git a/fs/bcachefs/io.c b/fs/bcachefs/io.c index 98ee50e09798..f02d60b25fa3 100644 --- a/fs/bcachefs/io.c +++ b/fs/bcachefs/io.c @@ -479,7 +479,7 @@ static int bch2_write_index_default(struct bch_write_op *op) BTREE_ITER_SLOTS|BTREE_ITER_INTENT); ret = bch2_extent_update(&trans, inum, &iter, sk.k, - &op->res, op_journal_seq(op), + &op->res, &op->journal_seq, op->new_i_size, &op->i_sectors_delta, op->flags & BCH_WRITE_CHECK_ENOSPC); bch2_trans_iter_exit(&trans, &iter); @@ -682,7 +682,7 @@ static void bch2_write_index(struct closure *cl) continue_at(cl, __bch2_write, index_update_wq(op)); } else if (!op->error && (op->flags & BCH_WRITE_FLUSH)) { bch2_journal_flush_seq_async(&c->journal, - *op_journal_seq(op), + op->journal_seq, cl); continue_at(cl, bch2_write_done, index_update_wq(op)); } else { diff --git a/fs/bcachefs/io.h b/fs/bcachefs/io.h index 5d5eb49e8a56..19b4161c4b9b 100644 --- a/fs/bcachefs/io.h +++ b/fs/bcachefs/io.h @@ -40,7 +40,6 @@ enum bch_write_flags { __BCH_WRITE_FROM_INTERNAL, __BCH_WRITE_CHECK_ENOSPC, __BCH_WRITE_MOVE, - __BCH_WRITE_JOURNAL_SEQ_PTR, __BCH_WRITE_SKIP_CLOSURE_PUT, __BCH_WRITE_DONE, __BCH_WRITE_IO_ERROR, @@ -59,17 +58,10 @@ enum bch_write_flags { #define BCH_WRITE_MOVE (1U << __BCH_WRITE_MOVE) /* Internal: */ -#define BCH_WRITE_JOURNAL_SEQ_PTR (1U << __BCH_WRITE_JOURNAL_SEQ_PTR) #define BCH_WRITE_SKIP_CLOSURE_PUT (1U << __BCH_WRITE_SKIP_CLOSURE_PUT) #define BCH_WRITE_DONE (1U << __BCH_WRITE_DONE) #define BCH_WRITE_IO_ERROR (1U << __BCH_WRITE_IO_ERROR) -static inline u64 *op_journal_seq(struct bch_write_op *op) -{ - return (op->flags & BCH_WRITE_JOURNAL_SEQ_PTR) - ? op->journal_seq_p : &op->journal_seq; -} - static inline struct workqueue_struct *index_update_wq(struct bch_write_op *op) { return op->alloc_reserve == RESERVE_movinggc diff --git a/fs/bcachefs/io_types.h b/fs/bcachefs/io_types.h index 5707ea914cec..3673d17cbe42 100644 --- a/fs/bcachefs/io_types.h +++ b/fs/bcachefs/io_types.h @@ -136,14 +136,7 @@ struct bch_write_op { struct open_buckets open_buckets; - /* - * If caller wants to flush but hasn't passed us a journal_seq ptr, we - * still need to stash the journal_seq somewhere: - */ - union { - u64 *journal_seq_p; - u64 journal_seq; - }; + u64 journal_seq; u64 new_i_size; s64 i_sectors_delta; |