1 files changed, 8 insertions, 58 deletions

diff --git a/bcache-userspace-shim.c b/bcache-userspace-shim.c
index 8634d8f7..021664f7 100644
--- a/bcache-userspace-shim.c
+++ b/bcache-userspace-shim.c
@@ -5,56 +5,6 @@
 #include "libbcache.h"
 #include "tools-util.h"
 
-/* stub out the bcache code we aren't building: */
-
-struct block_device;
-struct bcache_superblock;
-struct cache;
-struct cache_accounting;
-struct cache_set;
-struct closure;
-struct file;
-struct kobject;
-
-struct kmem_cache *bch_search_cache;
-
-const char *bch_backing_dev_register(struct bcache_superblock *sb)
-{
-	return "not implemented";
-}
-void bch_blockdevs_stop(struct cache_set *c) {}
-int bch_blockdev_volumes_start(struct cache_set *c) { return 0; }
-void bch_attach_backing_devs(struct cache_set *c) {}
-bool bch_is_open_backing_dev(struct block_device *bdev) { return false; }
-void bch_blockdev_exit(void) {}
-int bch_blockdev_init(void) { return 0; }
-
-void bch_fs_exit(void) {}
-int bch_fs_init(void) { return 0; }
-
-const struct file_operations bch_chardev_fops;
-
-void bcache_dev_sectors_dirty_add(struct cache_set *c, unsigned inode,
-				  u64 offset, int nr_sectors) {}
-void bch_writeback_recalc_oldest_gens(struct cache_set *c) {}
-
-void bch_notify_cache_set_read_write(struct cache_set *c) {}
-void bch_notify_cache_set_read_only(struct cache_set *c) {}
-void bch_notify_cache_set_stopped(struct cache_set *c) {}
-void bch_notify_cache_read_write(struct cache *c) {}
-void bch_notify_cache_read_only(struct cache *c) {}
-void bch_notify_cache_added(struct cache *c) {}
-void bch_notify_cache_removing(struct cache *c) {}
-void bch_notify_cache_removed(struct cache *c) {}
-void bch_notify_cache_remove_failed(struct cache *c) {}
-void bch_notify_cache_error(struct cache *c, bool b) {}
-
-int bch_cache_accounting_add_kobjs(struct cache_accounting *acc,
-				   struct kobject *parent) { return 0; }
-void bch_cache_accounting_destroy(struct cache_accounting *acc) {}
-void bch_cache_accounting_init(struct cache_accounting *acc,
-			       struct closure *parent) {}
-
 #define bch_fmt(_c, fmt)	fmt "\n"
 
 enum fsck_err_opts fsck_err_opt;
@@ -155,14 +105,14 @@ enum fsck_err_opts fsck_err_opt;
 #define SHIM_KTYPE(type)						\
 struct kobj_type type ## _ktype = { .release = type ## _release, }
 
-static void bch_cache_set_internal_release(struct kobject *k) {}
+static void bch_fs_internal_release(struct kobject *k) {}
 
-static void bch_cache_set_opts_dir_release(struct kobject *k) {}
+static void bch_fs_opts_dir_release(struct kobject *k) {}
 
-static void bch_cache_set_time_stats_release(struct kobject *k) {}
+static void bch_fs_time_stats_release(struct kobject *k) {}
 
-SHIM_KTYPE(bch_cache);
-SHIM_KTYPE(bch_cache_set);
-SHIM_KTYPE(bch_cache_set_internal);
-SHIM_KTYPE(bch_cache_set_time_stats);
-SHIM_KTYPE(bch_cache_set_opts_dir);
+SHIM_KTYPE(bch_dev);
+SHIM_KTYPE(bch_fs);
+SHIM_KTYPE(bch_fs_internal);
+SHIM_KTYPE(bch_fs_time_stats);
+SHIM_KTYPE(bch_fs_opts_dir);