Delete more unused shim code, update bcache code

1 files changed, 25 insertions, 2 deletions

diff --git a/libbcache/chardev.h b/libbcache/chardev.h
index 657bf2b1..15310c19 100644
--- a/libbcache/chardev.h
+++ b/libbcache/chardev.h
@@ -1,7 +1,30 @@
 #ifndef _BCACHE_CHARDEV_H
 #define _BCACHE_CHARDEV_H
 
-long bch_cache_set_ioctl(struct cache_set *, unsigned, void __user *);
-extern const struct file_operations bch_chardev_fops;
+#ifndef NO_BCACHE_CHARDEV
+
+long bch_fs_ioctl(struct cache_set *, unsigned, void __user *);
+
+void bch_fs_chardev_exit(struct cache_set *);
+int bch_fs_chardev_init(struct cache_set *);
+
+void bch_chardev_exit(void);
+int __init bch_chardev_init(void);
+
+#else
+
+static inline long bch_fs_ioctl(struct cache_set *c,
+				unsigned cmd, void __user * arg)
+{
+	return -ENOSYS;
+}
+
+static inline void bch_fs_chardev_exit(struct cache_set *c) {}
+static inline int bch_fs_chardev_init(struct cache_set *c) { return 0; }
+
+static inline void bch_chardev_exit(void) {}
+static inline int __init bch_chardev_init(void) { return 0; }
+
+#endif
 
 #endif /* _BCACHE_CHARDEV_H */