[PATCH 1/5] bcachefs: Delete dead code

From: Thomas Weißschuh
Date: Tue Sep 12 2023 - 17:25:06 EST


It is not used, might as well delete it.

Signed-off-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
---
fs/bcachefs/btree_update.c | 11 -----------
fs/bcachefs/btree_update.h | 1 -
fs/bcachefs/fs-io-pagecache.c | 7 -------
fs/bcachefs/reflink.c | 8 --------
4 files changed, 27 deletions(-)

diff --git a/fs/bcachefs/btree_update.c b/fs/bcachefs/btree_update.c
index 880ce7431894..3dcb05b51e2d 100644
--- a/fs/bcachefs/btree_update.c
+++ b/fs/bcachefs/btree_update.c
@@ -871,17 +871,6 @@ __bch2_fs_log_msg(struct bch_fs *c, unsigned commit_flags, const char *fmt,
return ret;
}

-int bch2_fs_log_msg(struct bch_fs *c, const char *fmt, ...)
-{
- va_list args;
- int ret;
-
- va_start(args, fmt);
- ret = __bch2_fs_log_msg(c, 0, fmt, args);
- va_end(args);
- return ret;
-}
-
/*
* Use for logging messages during recovery to enable reserved space and avoid
* blocking.
diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h
index 901c42b57c35..c6ab11c76cc3 100644
--- a/fs/bcachefs/btree_update.h
+++ b/fs/bcachefs/btree_update.h
@@ -114,7 +114,6 @@ void bch2_trans_commit_hook(struct btree_trans *,
struct btree_trans_commit_hook *);
int __bch2_trans_commit(struct btree_trans *, unsigned);

-int bch2_fs_log_msg(struct bch_fs *, const char *, ...);
int bch2_journal_log_msg(struct bch_fs *, const char *, ...);

/**
diff --git a/fs/bcachefs/fs-io-pagecache.c b/fs/bcachefs/fs-io-pagecache.c
index 1e60eead2981..c38f002215cd 100644
--- a/fs/bcachefs/fs-io-pagecache.c
+++ b/fs/bcachefs/fs-io-pagecache.c
@@ -73,13 +73,6 @@ int bch2_write_invalidate_inode_pages_range(struct address_space *mapping,
return ret;
}

-static const char * const bch2_folio_sector_states[] = {
-#define x(n) #n,
- BCH_FOLIO_SECTOR_STATE()
-#undef x
- NULL
-};
-
static inline enum bch_folio_sector_state
folio_sector_dirty(enum bch_folio_sector_state state)
{
diff --git a/fs/bcachefs/reflink.c b/fs/bcachefs/reflink.c
index 39f711d5069e..7b20e1267fa8 100644
--- a/fs/bcachefs/reflink.c
+++ b/fs/bcachefs/reflink.c
@@ -89,14 +89,6 @@ void bch2_reflink_v_to_text(struct printbuf *out, struct bch_fs *c,
bch2_bkey_ptrs_to_text(out, c, k);
}

-bool bch2_reflink_v_merge(struct bch_fs *c, struct bkey_s _l, struct bkey_s_c _r)
-{
- struct bkey_s_reflink_v l = bkey_s_to_reflink_v(_l);
- struct bkey_s_c_reflink_v r = bkey_s_c_to_reflink_v(_r);
-
- return l.v->refcount == r.v->refcount && bch2_extent_merge(c, _l, _r);
-}
-
int bch2_trans_mark_reflink_v(struct btree_trans *trans,
enum btree_id btree_id, unsigned level,
struct bkey_s_c old, struct bkey_i *new,

--
2.42.0