Update bcachefs sources to ee560a3929 bcachefs: Print version, options earlier in...

[bcachefs-tools-debian] / tools-util.h

diff --git a/tools-util.h b/tools-util.h
index 649ea9bb0075f283e200d88f360aec376ecc6b8c..aa7c0270331e1cf07be5efdf3eb18374121ae8d9 100644 (file)
--- a/tools-util.h
+++ b/tools-util.h
@@ -2,9 +2,11 @@
 #define _TOOLS_UTIL_H
 
 #include <errno.h>
+#include <mntent.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -16,17 +18,24 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/uuid.h>
-#include "ccan/darray/darray.h"
+#include "libbcachefs/bcachefs.h"
+#include "libbcachefs/bbpos.h"
+#include "libbcachefs/darray.h"
 
-void die(const char *, ...);
-char *mprintf(const char *, ...);
+#define noreturn __attribute__((noreturn))
+
+void die(const char *, ...)
+       __attribute__ ((format (printf, 1, 2))) noreturn;
+char *mprintf(const char *, ...)
+       __attribute__ ((format (printf, 1, 2)));
 void *xcalloc(size_t, size_t);
 void *xmalloc(size_t);
 void *xrealloc(void *, size_t);
 void xpread(int, void *, size_t, off_t);
-void xpwrite(int, const void *, size_t, off_t);
+void xpwrite(int, const void *, size_t, off_t, const char *);
 struct stat xfstatat(int, const char *, int);
 struct stat xfstat(int);
+struct stat xstat(const char *);
 
 #define xopenat(_dirfd, _path, ...)                                    \
 ({                                                                     \
@@ -39,25 +48,14 @@ struct stat xfstat(int);
 #define xopen(...)     xopenat(AT_FDCWD, __VA_ARGS__)
 
 #define xioctl(_fd, _nr, ...)                                          \
-do {                                                                   \
-       if (ioctl((_fd), (_nr), ##__VA_ARGS__))                         \
+({                                                                     \
+       int _ret = ioctl((_fd), (_nr), ##__VA_ARGS__);                  \
+       if (_ret < 0)                                                   \
                die(#_nr " ioctl error: %m");                           \
-} while (0)
-
-enum units {
-       BYTES,
-       SECTORS,
-       HUMAN_READABLE,
-};
-
-struct units_buf __pr_units(s64, enum units);
-
-struct units_buf {
-       char    b[20];
-};
-
-#define pr_units(_v, _u)       &(__pr_units(_v, _u).b[0])
+       _ret;                                                           \
+})
 
+void write_file_str(int, const char *, const char *);
 char *read_file_str(int, const char *);
 u64 read_file_u64(int, const char *);
 
@@ -68,17 +66,6 @@ u64 get_size(const char *, int);
 unsigned get_blocksize(const char *, int);
 int open_for_format(const char *, bool);
 
-int bcachectl_open(void);
-
-struct bcache_handle {
-       uuid_le uuid;
-       int     ioctl_fd;
-       int     sysfs_fd;
-};
-
-void bcache_fs_close(struct bcache_handle);
-struct bcache_handle bcache_fs_open(const char *);
-
 bool ask_yn(void);
 
 struct range {
@@ -86,14 +73,14 @@ struct range {
        u64             end;
 };
 
-typedef darray(struct range) ranges;
+typedef DARRAY(struct range) ranges;
 
 static inline void range_add(ranges *data, u64 offset, u64 size)
 {
-       darray_append(*data, (struct range) {
+       darray_push(data, ((struct range) {
                .start = offset,
                .end = offset + size
-       });
+       }));
 }
 
 void ranges_sort_merge(ranges *);
@@ -109,9 +96,9 @@ struct hole_iter {
 static inline struct range hole_iter_next(struct hole_iter *iter)
 {
        struct range r = {
-               .start  = iter->idx ? iter->r.item[iter->idx - 1].end : 0,
-               .end    = iter->idx < iter->r.size
-                       ? iter->r.item[iter->idx].start : iter->end,
+               .start  = iter->idx ? iter->r.data[iter->idx - 1].end : 0,
+               .end    = iter->idx < iter->r.nr
+                       ? iter->r.data[iter->idx].start : iter->end,
        };
 
        BUG_ON(r.start > r.end);
@@ -122,7 +109,7 @@ static inline struct range hole_iter_next(struct hole_iter *iter)
 
 #define for_each_hole(_iter, _ranges, _end, _i)                                \
        for (_iter = (struct hole_iter) { .r = _ranges, .end = _end };  \
-            (_iter.idx <= _iter.r.size &&                              \
+            (_iter.idx <= _iter.r.nr &&                                \
              (_i = hole_iter_next(&_iter), true));)
 
 #include <linux/fiemap.h>
@@ -149,12 +136,31 @@ struct fiemap_extent fiemap_iter_next(struct fiemap_iter *);
        for (fiemap_iter_init(&iter, fd);                               \
             (extent = fiemap_iter_next(&iter)).fe_length;)
 
-const char *strcmp_prefix(const char *, const char *);
-
-unsigned hatoi_validate(const char *, const char *);
+char *strcmp_prefix(char *, const char *);
 
 u32 crc32c(u32, const void *, size_t);
 
+char *dev_to_name(dev_t);
 char *dev_to_path(dev_t);
+struct mntent *dev_to_mount(char *);
+int dev_mounted(char *);
+
+#define args_shift(_nr)                                                        \
+do {                                                                   \
+       unsigned _n = min((_nr), argc);                                 \
+       argc -= _n;                                                     \
+       argv += _n;                                                     \
+} while (0)
+
+#define arg_pop()                                                      \
+({                                                                     \
+       char *_ret = argc ? argv[0] : NULL;                             \
+       if (_ret)                                                       \
+               args_shift(1);                                          \
+       _ret;                                                           \
+})
+
+struct bpos bpos_parse(char *);
+struct bbpos bbpos_parse(char *);
 
 #endif /* _TOOLS_UTIL_H */