Redo lots of stuff

[bcachefs-tools-debian] / bcache.h

diff --git a/bcache.h b/bcache.h
index 63fa670f31873ed473cb932cc9f0c9a8baef65b1..a3ff1b3c05432210c391ca9a6bc5234c48380386 100644 (file)
--- a/bcache.h
+++ b/bcache.h
@@ -1,5 +1,5 @@
 /*
- * Author: Kent Overstreet <kmo@daterainc.com>
+ * Author: Kent Overstreet <kent.overstreet@gmail.com>
  *
  * GPLv2
  */
@@ -7,54 +7,7 @@
 #ifndef _BCACHE_H
 #define _BCACHE_H
 
-#include <stdint.h>
-#include <dirent.h>
-
-#define __packed       __attribute__((__packed__))
-
-#include "bcache-ondisk.h"
-#include "bcache-ioctl.h"
-
-typedef __u8   u8;
-typedef __u16  u16;
-typedef __u32  u32;
-typedef __u64  u64;
-
-typedef __s8   s8;
-typedef __s16  s16;
-typedef __s32  s32;
-typedef __s64  s64;
-
-#define SB_START               (SB_SECTOR * 512)
-#define MAX_PATH               256
-#define MAX_DEVS               MAX_CACHES_PER_SET
-
-#define min(x, y) ({                           \
-       typeof(x) _min1 = (x);                  \
-       typeof(y) _min2 = (y);                  \
-       (void) (&_min1 == &_min2);              \
-       _min1 < _min2 ? _min1 : _min2; })
-
-#define max(x, y) ({                           \
-       typeof(x) _max1 = (x);                  \
-       typeof(y) _max2 = (y);                  \
-       (void) (&_max1 == &_max2);              \
-       _max1 > _max2 ? _max1 : _max2; })
-
-#define __bkey_idx(_set, _offset)                              \
-       ((_set)->_data + (_offset))
-
-#define bkey_idx(_set, _offset)                                        \
-       ((typeof(&(_set)->start[0])) __bkey_idx((_set), (_offset)))
-
-#define bkey_next(_k)                                          \
-       ((typeof(_k)) __bkey_idx(_k, (_k)->u64s))
-
-#define __bset_bkey_last(_set)                                 \
-        __bkey_idx((_set), (_set)->u64s)
-
-#define bset_bkey_last(_set)                                   \
-        bkey_idx((_set), (_set)->u64s)
+#include "util.h"
 
 extern const char * const cache_state[];
 extern const char * const replacement_policies[];
@@ -63,53 +16,5 @@ extern const char * const compression_types[];
 extern const char * const error_actions[];
 extern const char * const bdev_cache_mode[];
 extern const char * const bdev_state[];
-extern const char * const set_attr[];
-extern const char * const cache_attrs[];
-extern const char * const internal_attrs[];
-
-ssize_t read_string_list(const char *, const char * const[]);
-ssize_t read_string_list_or_die(const char *, const char * const[],
-                               const char *);
-void print_string_list(const char * const[], size_t);
-
-uint64_t bch_checksum(unsigned, const void *, size_t);
-
-uint64_t getblocks(int);
-uint64_t hatoi(const char *);
-unsigned hatoi_validate(const char *, const char *);
-int dev_open(const char *);
-unsigned get_blocksize(const char *, int);
-long strtoul_or_die(const char *, size_t, const char *);
-
-void show_super_backingdev(struct cache_sb *, bool);
-void show_super_cache(struct cache_sb *, bool);
-
-enum sysfs_attr {SET_ATTR, CACHE_ATTR, INTERNAL_ATTR};
-
-enum sysfs_attr sysfs_attr_type(const char *attr);
-void sysfs_attr_list();
-
-struct cache_sb *query_dev(char *, bool, bool, bool, char *dev_uuid);
-char *parse_array_to_list(char *const *);
-char *register_bcache(char *const *);
-char *find_matching_uuid(char *, char *, const char*);
-char *dev_name(const char *);
-
-int bcachectl_open(void);
-unsigned nr_args(char * const *);
-
-#define csum_set(i, type)                                              \
-({                                                                     \
-       void *start = ((void *) (i)) + sizeof(uint64_t);                \
-       void *end = __bset_bkey_last(i);                                \
-                                                                       \
-       bch_checksum(type, start, end - start);                         \
-})
-
-#define die(arg, ...)                                  \
-do {                                                   \
-       fprintf(stderr, arg "\n", ##__VA_ARGS__);       \
-       exit(EXIT_FAILURE);                             \
-} while (0)
 
-#endif
+#endif /* _BCACHE_H */