Delete more unused shim code, update bcache code

[bcachefs-tools-debian] / include / linux / bcache.h

diff --git a/include/linux/bcache.h b/include/linux/bcache.h
index 4179f8ddd85057841e25935f0dd845b8e98f48b7..dbb02742c47bf99168b621a12d04b7eaca4d65b4 100644 (file)
--- a/include/linux/bcache.h
+++ b/include/linux/bcache.h
@@ -1021,80 +1021,6 @@ enum bch_compression_opts {
        BCH_COMPRESSION_NR              = 3,
 };
 
-/**
- * BCH_OPT(name, choices, min, max, sb_option, sysfs_writeable)
- *
- * @name - name of mount option, sysfs attribute, and struct cache_set_opts
- *     member
- *
- * @choices - array of strings that the user can select from - option is by
- *     array index
- *
- *     Booleans are special cased; if @choices is bch_bool_opt the mount
- *     options name and noname will work as expected.
- *
- * @min, @max
- *
- * @sb_option - name of corresponding superblock option
- *
- * @sysfs_writeable - if true, option will be modifiable at runtime via sysfs
- */
-
-#define BCH_SB_OPTS()                                          \
-       BCH_OPT(errors,                                         \
-               bch_error_actions,                              \
-               0, BCH_NR_ERROR_ACTIONS,                        \
-               BCH_SB_ERROR_ACTION,                            \
-               true)                                           \
-       BCH_OPT(metadata_replicas,                              \
-               bch_uint_opt,                                   \
-               0, BCH_REPLICAS_MAX,                            \
-               BCH_SB_META_REPLICAS_WANT,                      \
-               false)                                          \
-       BCH_OPT(data_replicas,                                  \
-               bch_uint_opt,                                   \
-               0, BCH_REPLICAS_MAX,                            \
-               BCH_SB_DATA_REPLICAS_WANT,                      \
-               false)                                          \
-       BCH_OPT(metadata_checksum,                              \
-               bch_csum_types,                                 \
-               0, BCH_CSUM_OPT_NR,                             \
-               BCH_SB_META_CSUM_TYPE,                          \
-               true)                                           \
-       BCH_OPT(data_checksum,                                  \
-               bch_csum_types,                                 \
-               0, BCH_CSUM_OPT_NR,                             \
-               BCH_SB_DATA_CSUM_TYPE,                          \
-               true)                                           \
-       BCH_OPT(compression,                                    \
-               bch_compression_types,                          \
-               0, BCH_COMPRESSION_NR,                          \
-               BCH_SB_COMPRESSION_TYPE,                        \
-               true)                                           \
-       BCH_OPT(str_hash,                                       \
-               bch_str_hash_types,                             \
-               0, BCH_STR_HASH_NR,                             \
-               BCH_SB_STR_HASH_TYPE,                           \
-               true)                                           \
-       BCH_OPT(inodes_32bit,                                   \
-               bch_bool_opt, 0, 2,                             \
-               BCH_SB_INODE_32BIT,                             \
-               true)                                           \
-       BCH_OPT(gc_reserve_percent,                             \
-               bch_uint_opt,                                   \
-               5, 21,                                          \
-               BCH_SB_GC_RESERVE,                              \
-               false)                                          \
-       BCH_OPT(root_reserve_percent,                           \
-               bch_uint_opt,                                   \
-               0, 100,                                         \
-               BCH_SB_ROOT_RESERVE,                            \
-               false)                                          \
-       BCH_OPT(wide_macs,                                      \
-               bch_bool_opt, 0, 2,                             \
-               BCH_SB_128_BIT_MACS,                            \
-               true)
-
 /* backing device specific stuff: */
 
 struct backingdev_sb {