]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bcachefs: Kill a bit of dead code
authorKent Overstreet <kent.overstreet@linux.dev>
Tue, 11 Mar 2025 13:31:03 +0000 (09:31 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sat, 15 Mar 2025 01:02:16 +0000 (21:02 -0400)
Found with CC=clang W=1

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/btree_iter.c
fs/bcachefs/inode.c
fs/bcachefs/journal_io.c
fs/bcachefs/move.c

index e32fce4fd25832b1d021d58f9acffc7c778df4ef..7542c6f9c88ea66591ed71bcd35574e1af77a3c1 100644 (file)
@@ -562,20 +562,6 @@ static inline struct bkey_s_c btree_path_level_peek_all(struct bch_fs *c,
                        bch2_btree_node_iter_peek_all(&l->iter, l->b));
 }
 
-static inline struct bkey_s_c btree_path_level_peek(struct btree_trans *trans,
-                                                   struct btree_path *path,
-                                                   struct btree_path_level *l,
-                                                   struct bkey *u)
-{
-       struct bkey_s_c k = __btree_iter_unpack(trans->c, l, u,
-                       bch2_btree_node_iter_peek(&l->iter, l->b));
-
-       path->pos = k.k ? k.k->p : l->b->key.k.p;
-       trans->paths_sorted = false;
-       bch2_btree_path_verify_level(trans, path, l - path->l);
-       return k;
-}
-
 static inline struct bkey_s_c btree_path_level_prev(struct btree_trans *trans,
                                                    struct btree_path *path,
                                                    struct btree_path_level *l,
index 339b80770f1dd60c16e370b1100aa84eb2a3b30f..7aca010e2e1037bf179da2abec4e5b14ffc752b8 100644 (file)
@@ -868,19 +868,6 @@ void bch2_inode_init(struct bch_fs *c, struct bch_inode_unpacked *inode_u,
                             uid, gid, mode, rdev, parent);
 }
 
-static inline u32 bkey_generation(struct bkey_s_c k)
-{
-       switch (k.k->type) {
-       case KEY_TYPE_inode:
-       case KEY_TYPE_inode_v2:
-               BUG();
-       case KEY_TYPE_inode_generation:
-               return le32_to_cpu(bkey_s_c_to_inode_generation(k).v->bi_generation);
-       default:
-               return 0;
-       }
-}
-
 static struct bkey_i_inode_alloc_cursor *
 bch2_inode_alloc_cursor_get(struct btree_trans *trans, u64 cpu, u64 *min, u64 *max)
 {
index 331c9d762439850606e44ab8b701507c27429391..cf2700b06d58f57f557c5855487a452cd2482c6f 100644 (file)
@@ -1609,11 +1609,6 @@ static void journal_buf_realloc(struct journal *j, struct journal_buf *buf)
        kvfree(new_buf);
 }
 
-static inline struct journal_buf *journal_last_unwritten_buf(struct journal *j)
-{
-       return j->buf + (journal_last_unwritten_seq(j) & JOURNAL_BUF_MASK);
-}
-
 static CLOSURE_CALLBACK(journal_write_done)
 {
        closure_type(w, struct journal_buf, io);
index ee489d222fba4ba4e65792942476d2c26df6ad29..0787d04a5fc3873aa540137407ba57778fe1596c 100644 (file)
@@ -712,7 +712,6 @@ static int __bch2_move_data_phys(struct moving_context *ctxt,
        struct btree_iter iter = {}, bp_iter = {};
        struct bkey_buf sk;
        struct bkey_s_c k;
-       unsigned sectors_moved = 0;
        struct bkey_buf last_flushed;
        int ret = 0;
 
@@ -834,7 +833,6 @@ static int __bch2_move_data_phys(struct moving_context *ctxt,
 
                if (ctxt->stats)
                        atomic64_add(sectors, &ctxt->stats->sectors_seen);
-               sectors_moved += sectors;
 next:
                bch2_btree_iter_advance(&bp_iter);
        }