bcachefs: Kill BCH_WRITE_JOURNAL_SEQ_PTR

Dead code, delete.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c
index 927deb3943b586596f6dfe57ed145df868024c72..658868048c22e5deb427ca95e25c61850ff477f2 100644 (file)
--- a/fs/bcachefs/data_update.c
+++ b/fs/bcachefs/data_update.c
@@ -226,7 +226,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 616407fa08ae8c70d9307b9cd8286db90191a82d..97427487aa79586553f33e1f78ce210ccd73c1dd 100644 (file)
--- a/fs/bcachefs/io.c
+++ b/fs/bcachefs/io.c
@@ -507,7 +507,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);
@@ -776,7 +776,7 @@ unlock:
                        __bch2_write(op);
                } else if (!op->error && (op->flags & BCH_WRITE_FLUSH)) {
                        bch2_journal_flush_seq_async(&op->c->journal,
-                                                    *op_journal_seq(op),
+                                                    op->journal_seq,
                                                     &op->cl);
                        continue_at(&op->cl, bch2_write_done, index_update_wq(op));
                } else {

diff --git a/fs/bcachefs/io.h b/fs/bcachefs/io.h
index a3505762b68df577cf5ba8bb885bca73a73d0a41..730c7a5bcce8cef65d99a712d68ef5591c39606e 100644 (file)
--- 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_IN_WORKER,
        __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_IN_WORKER            (1U << __BCH_WRITE_IN_WORKER)
 #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 c316a39d381a1f4111b4e53b56ce3feed108f17b..685fb118339965d76177b36be625935a16b89b09 100644 (file)
--- a/fs/bcachefs/io_types.h
+++ b/fs/bcachefs/io_types.h
@@ -142,14 +142,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;