diff options
author | Kent Overstreet <koverstreet@google.com> | 2013-03-25 14:46:43 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2013-03-25 15:06:13 -0400 |
commit | 07e86ccb543bb1e748f32d6f0f18913d3f58d988 (patch) | |
tree | 0faa1c12ff2e427a53c71e8ab94efa4ef1e9bee8 /drivers/md/bcache | |
parent | e226e34165d6ea827fcbd6fbf4df49090c4d0dbc (diff) |
bcache: Build fixes from test robot
config: make ARCH=i386 allmodconfig
All error/warnings:
drivers/md/bcache/bset.c: In function 'bch_ptr_bad':
>> drivers/md/bcache/bset.c:164:2: warning: format '%li' expects argument of type 'long int', but argument 4 has type 'size_t' [-Wformat]
--
drivers/md/bcache/debug.c: In function 'bch_pbtree':
>> drivers/md/bcache/debug.c:86:4: warning: format '%li' expects argument of type 'long int', but argument 4 has type 'size_t' [-Wformat]
--
drivers/md/bcache/btree.c: In function 'bch_btree_read_done':
>> drivers/md/bcache/btree.c:245:8: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Wformat]
--
drivers/md/bcache/closure.o: In function `closure_debug_init':
>> (.init.text+0x0): multiple definition of `init_module'
>> drivers/md/bcache/super.o:super.c:(.init.text+0x0): first defined here
Signed-off-by: Kent Overstreet <koverstreet@google.com>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: linux-bcache@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/bcache')
-rw-r--r-- | drivers/md/bcache/bset.c | 2 | ||||
-rw-r--r-- | drivers/md/bcache/btree.c | 2 | ||||
-rw-r--r-- | drivers/md/bcache/closure.c | 4 | ||||
-rw-r--r-- | drivers/md/bcache/closure.h | 2 | ||||
-rw-r--r-- | drivers/md/bcache/super.c | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c index bb0f7ae14b3c..79fe1f0190f7 100644 --- a/drivers/md/bcache/bset.c +++ b/drivers/md/bcache/bset.c | |||
@@ -161,7 +161,7 @@ bool bch_ptr_bad(struct btree *b, const struct bkey *k) | |||
161 | #ifdef CONFIG_BCACHE_EDEBUG | 161 | #ifdef CONFIG_BCACHE_EDEBUG |
162 | bug: | 162 | bug: |
163 | mutex_unlock(&b->c->bucket_lock); | 163 | mutex_unlock(&b->c->bucket_lock); |
164 | btree_bug(b, "inconsistent pointer %s: bucket %li pin %i " | 164 | btree_bug(b, "inconsistent pointer %s: bucket %zu pin %i " |
165 | "prio %i gen %i last_gc %i mark %llu gc_gen %i", pkey(k), | 165 | "prio %i gen %i last_gc %i mark %llu gc_gen %i", pkey(k), |
166 | PTR_BUCKET_NR(b->c, k, i), atomic_read(&g->pin), | 166 | PTR_BUCKET_NR(b->c, k, i), atomic_read(&g->pin), |
167 | g->prio, g->gen, g->last_gc, GC_MARK(g), g->gc_gen); | 167 | g->prio, g->gen, g->last_gc, GC_MARK(g), g->gc_gen); |
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index e7bc917ef0d7..af9ea4a96330 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c | |||
@@ -240,7 +240,7 @@ out: | |||
240 | closure_return(cl); | 240 | closure_return(cl); |
241 | err: | 241 | err: |
242 | set_btree_node_io_error(b); | 242 | set_btree_node_io_error(b); |
243 | bch_cache_set_error(b->c, "%s at bucket %lu, block %zu, %u keys", | 243 | bch_cache_set_error(b->c, "%s at bucket %zu, block %zu, %u keys", |
244 | err, PTR_BUCKET_NR(b->c, &b->key, 0), | 244 | err, PTR_BUCKET_NR(b->c, &b->key, 0), |
245 | index(i, b), i->keys); | 245 | index(i, b), i->keys); |
246 | goto out; | 246 | goto out; |
diff --git a/drivers/md/bcache/closure.c b/drivers/md/bcache/closure.c index d6fbec0f8484..f54f7c9981d4 100644 --- a/drivers/md/bcache/closure.c +++ b/drivers/md/bcache/closure.c | |||
@@ -334,14 +334,12 @@ static const struct file_operations debug_ops = { | |||
334 | .release = single_release | 334 | .release = single_release |
335 | }; | 335 | }; |
336 | 336 | ||
337 | int __init closure_debug_init(void) | 337 | void __init closure_debug_init(void) |
338 | { | 338 | { |
339 | debug = debugfs_create_file("closures", 0400, NULL, NULL, &debug_ops); | 339 | debug = debugfs_create_file("closures", 0400, NULL, NULL, &debug_ops); |
340 | return 0; | 340 | return 0; |
341 | } | 341 | } |
342 | 342 | ||
343 | module_init(closure_debug_init); | ||
344 | |||
345 | #endif | 343 | #endif |
346 | 344 | ||
347 | MODULE_AUTHOR("Kent Overstreet <koverstreet@google.com>"); | 345 | MODULE_AUTHOR("Kent Overstreet <koverstreet@google.com>"); |
diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h index 3f31d599ea56..00039924ea9d 100644 --- a/drivers/md/bcache/closure.h +++ b/drivers/md/bcache/closure.h | |||
@@ -313,11 +313,13 @@ void __closure_flush_sync(struct closure *cl, struct timer_list *timer); | |||
313 | 313 | ||
314 | #ifdef CONFIG_BCACHE_CLOSURES_DEBUG | 314 | #ifdef CONFIG_BCACHE_CLOSURES_DEBUG |
315 | 315 | ||
316 | void closure_debug_init(void); | ||
316 | void closure_debug_create(struct closure *cl); | 317 | void closure_debug_create(struct closure *cl); |
317 | void closure_debug_destroy(struct closure *cl); | 318 | void closure_debug_destroy(struct closure *cl); |
318 | 319 | ||
319 | #else | 320 | #else |
320 | 321 | ||
322 | static inline void closure_debug_init(void) {} | ||
321 | static inline void closure_debug_create(struct closure *cl) {} | 323 | static inline void closure_debug_create(struct closure *cl) {} |
322 | static inline void closure_debug_destroy(struct closure *cl) {} | 324 | static inline void closure_debug_destroy(struct closure *cl) {} |
323 | 325 | ||
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 31ef47f1f3b6..7b8efc770871 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c | |||
@@ -1917,6 +1917,7 @@ static int __init bcache_init(void) | |||
1917 | mutex_init(&bch_register_lock); | 1917 | mutex_init(&bch_register_lock); |
1918 | init_waitqueue_head(&unregister_wait); | 1918 | init_waitqueue_head(&unregister_wait); |
1919 | register_reboot_notifier(&reboot); | 1919 | register_reboot_notifier(&reboot); |
1920 | closure_debug_init(); | ||
1920 | 1921 | ||
1921 | bcache_major = register_blkdev(0, "bcache"); | 1922 | bcache_major = register_blkdev(0, "bcache"); |
1922 | if (bcache_major < 0) | 1923 | if (bcache_major < 0) |