bcache kbuild cleanups
Subsystems (2)
Hi Coly,
this series removes a pointless cflags override and unused exports from bcache.
PATCH 1/2 bcache: remove the extra cflags for request.o
There is no block directory this file needs includes from.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/md/bcache/Makefile | 2 -- 1 file changed, 2 deletions(-)
drivers/md/bcache/Makefile +0 -2
@@ -5,5 +5,3 @@ obj-$(CONFIG_BCACHE) += bcache.o bcache-y := alloc.o bset.o btree.o closure.o debug.o extents.o\ io.o journal.o movinggc.o request.o stats.o super.o sysfs.o trace.o\ util.o writeback.o - -CFLAGS_request.o += -Iblock
Signature · 1 line
2.20.1
PATCH 2/2 bcache: don't export symbols
In reply to Christoph HellwigNone of the exported bcache symbols are actually used anywhere.
Signed-off-by Christoph Hellwig <[email protected]>
--- drivers/md/bcache/bset.c | 15 --------------- drivers/md/bcache/closure.c | 7 ------- 2 files changed, 22 deletions(-)
drivers/md/bcache/bset.c +0 -15
@@ -309,7 +309,6 @@ void bch_btree_keys_free(struct btree_keys *b) t->tree =NULL ; t->data =NULL ; } -EXPORT_SYMBOL (bch_btree_keys_free); int bch_btree_keys_alloc(struct btree_keys *b, unsigned int page_order,
@@ -342,7 +341,6 @@ int bch_btree_keys_alloc(struct btree_keys *b,bch_btree_keys_free (b);return -ENOMEM ; } -EXPORT_SYMBOL (bch_btree_keys_alloc);void bch_btree_keys_init (struct btree_keys *b,const struct btree_keys_ops *ops,bool *expensive_debug_checks)
@@ -361,7 +359,6 @@ void bch_btree_keys_init(struct btree_keys *b, const struct btree_keys_ops *ops,* any more. */ } -EXPORT_SYMBOL (bch_btree_keys_init);/* Binary tree stuff for auxiliary search trees */
@@ -678,7 +675,6 @@ void bch_bset_init_next(struct btree_keys *b, struct bset *i, uint64_t magic)bch_bset_build_unwritten_tree (b); } -EXPORT_SYMBOL (bch_bset_init_next);/* * Build auxiliary binary tree 'struct bset_tree *t', this tree is used to
@@ -732,7 +728,6 @@ void bch_bset_build_written_tree(struct btree_keys *b) j = inorder_next(j, t->size))make_bfloat (t, j); } -EXPORT_SYMBOL (bch_bset_build_written_tree);/* Insert */
@@ -780,7 +775,6 @@ fix_right: do { j = j *2 +1 ; }while (j < t->size); } -EXPORT_SYMBOL (bch_bset_fix_invalidated_key); static void bch_bset_fix_lookup_table(struct btree_keys *b, struct bset_tree *t,
@@ -855,7 +849,6 @@ bool bch_bkey_try_merge(struct btree_keys *b, struct bkey *l, struct bkey *r)return b->ops->key_merge (b, l, r); } -EXPORT_SYMBOL (bch_bkey_try_merge);void bch_bset_insert (struct btree_keys *b,struct bkey *where,struct bkey *insert)
@@ -875,7 +868,6 @@ void bch_bset_insert(struct btree_keys *b, struct bkey *where,bkey_copy (where, insert);bch_bset_fix_lookup_table (b, t, where); } -EXPORT_SYMBOL (bch_bset_insert);unsigned int bch_btree_insert_key (struct btree_keys *b,struct bkey *k,struct bkey *replace_key)
@@ -931,7 +923,6 @@ copy: bkey_copy(m, k); merged:return status; } -EXPORT_SYMBOL (bch_btree_insert_key);/* Lookup */
@@ -1077,7 +1068,6 @@ struct bkey *__bch_bset_search(struct btree_keys *b, struct bset_tree *t,return i.l; } -EXPORT_SYMBOL (__bch_bset_search);/* Btree iterator */
@@ -1132,7 +1122,6 @@ struct bkey *bch_btree_iter_init(struct btree_keys *b, {return __bch_btree_iter_init (b, iter, search, b->set); } -EXPORT_SYMBOL (bch_btree_iter_init);static inline struct bkey *__bch_btree_iter_next (struct btree_iter *iter,btree_iter_cmp_fn *cmp)
@@ -1165,7 +1154,6 @@ struct bkey *bch_btree_iter_next(struct btree_iter *iter)return __bch_btree_iter_next (iter, btree_iter_cmp); } -EXPORT_SYMBOL (bch_btree_iter_next);struct bkey *bch_btree_iter_next_filter (struct btree_iter *iter,struct btree_keys *b,ptr_filter_fn fn)
@@ -1196,7 +1184,6 @@ int bch_bset_sort_state_init(struct bset_sort_state *state,return mempool_init_page_pool (&state->pool,1 , page_order); } -EXPORT_SYMBOL (bch_bset_sort_state_init); static void btree_mergesort(struct btree_keys *b, struct bset *out, struct btree_iter *iter,
@@ -1313,7 +1300,6 @@ void bch_btree_sort_partial(struct btree_keys *b, unsigned int start,EBUG_ON (oldsize >=0 &&bch_count_data (b) != oldsize); } -EXPORT_SYMBOL (bch_btree_sort_partial); void bch_btree_sort_and_fix_extents(struct btree_keys *b, struct btree_iter *iter,
@@ -1366,7 +1352,6 @@ void bch_btree_sort_lazy(struct btree_keys *b, struct bset_sort_state *state) out:bch_bset_build_written_tree (b); } -EXPORT_SYMBOL (bch_btree_sort_lazy);void bch_btree_keys_stats (struct btree_keys *b,struct bset_stats *stats) {
drivers/md/bcache/closure.c +0 -7
@@ -45,7 +45,6 @@ void closure_sub(struct closure *cl, int v) {closure_put_after_sub (cl,atomic_sub_return (v, &cl->remaining)); } -EXPORT_SYMBOL (closure_sub);/* * closure_put - decrement a closure's refcount
@@ -54,7 +53,6 @@ void closure_put(struct closure *cl) {closure_put_after_sub (cl,atomic_dec_return (&cl->remaining)); } -EXPORT_SYMBOL (closure_put);/* * closure_wake_up - wake up all closures on a wait list, without memory barrier
@@ -76,7 +74,6 @@ void __closure_wake_up(struct closure_waitlist *wait_list)closure_sub (cl,CLOSURE_WAITING +1 ); } } -EXPORT_SYMBOL (__closure_wake_up);/** * closure_wait - add a closure to a waitlist
@@ -96,7 +93,6 @@ bool closure_wait(struct closure_waitlist *waitlist, struct closure *cl)return true; } -EXPORT_SYMBOL (closure_wait);struct closure_syncer {struct task_struct *task;
@@ -131,7 +127,6 @@ void __sched __closure_sync(struct closure *cl)__set_current_state (TASK_RUNNING ); } -EXPORT_SYMBOL (__closure_sync);#ifdef CONFIG_BCACHE_CLOSURES_DEBUG
@@ -149,7 +144,6 @@ void closure_debug_create(struct closure *cl)list_add (&cl->all, &closure_list);spin_unlock_irqrestore (&closure_list_lock, flags); } -EXPORT_SYMBOL (closure_debug_create);void closure_debug_destroy (struct closure *cl) {
@@ -162,7 +156,6 @@ void closure_debug_destroy(struct closure *cl)list_del (&cl->all);spin_unlock_irqrestore (&closure_list_lock, flags); } -EXPORT_SYMBOL (closure_debug_destroy);static struct dentry *closure_debug;
Signature · 1 line
2.20.1
Quoted 5 lines · Christoph Hellwig
Hi Coly,
this series removes a pointless cflags override and unused exports from bcache.
Sure, I add them in my for-next series. Thansk.
Signature · 1 line
Coly Li