Update bcachefs sources to 380885b0b8 bcachefs: Fix counting iterators for reflink...

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

diff --git a/tools-util.h b/tools-util.h
index 649ea9bb0075f283e200d88f360aec376ecc6b8c..e5c3508474b9431c60a6d63de59cce99965b4e45 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>
@@ -19,7 +21,8 @@
 #include "ccan/darray/darray.h"
 
 void die(const char *, ...);
-char *mprintf(const char *, ...);
+char *mprintf(const char *, ...)
+       __attribute__ ((format (printf, 1, 2)));
 void *xcalloc(size_t, size_t);
 void *xmalloc(size_t);
 void *xrealloc(void *, size_t);
@@ -27,6 +30,7 @@ void xpread(int, void *, size_t, off_t);
 void xpwrite(int, const void *, size_t, off_t);
 struct stat xfstatat(int, const char *, int);
 struct stat xfstat(int);
+struct stat xstat(const char *);
 
 #define xopenat(_dirfd, _path, ...)                                    \
 ({                                                                     \
@@ -39,10 +43,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)
+       _ret;                                                           \
+})
+
+int printf_pad(unsigned pad, const char * fmt, ...);
 
 enum units {
        BYTES,
@@ -68,17 +76,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 {
@@ -149,12 +146,30 @@ 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 *);
+char *strcmp_prefix(char *, const char *);
 
 unsigned hatoi_validate(const 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 *);
+bool dev_mounted_rw(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;                                                           \
+})
 
 #endif /* _TOOLS_UTIL_H */