Move BTRFS_IOC_DEVICES_READY to missing.h

diff --git a/src/shared/missing.h b/src/shared/missing.h
index d54cc1efe2276be4edd3ab60c837a591539cc526..e20f9bdfd35192b1af0f7ff6a080c87be5146149 100644 (file)
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -210,7 +210,8 @@ struct btrfs_ioctl_fs_info_args {
 #endif
 
 #ifndef BTRFS_IOC_DEFRAG
-#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, struct btrfs_ioctl_vol_args)
+#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
+                                 struct btrfs_ioctl_vol_args)
 #endif
 
 #ifndef BTRFS_IOC_DEV_INFO
@@ -220,7 +221,12 @@ struct btrfs_ioctl_fs_info_args {
 
 #ifndef BTRFS_IOC_FS_INFO
 #define BTRFS_IOC_FS_INFO _IOR(BTRFS_IOCTL_MAGIC, 31, \
-                               struct btrfs_ioctl_fs_info_args)
+                                 struct btrfs_ioctl_fs_info_args)
+#endif
+
+#ifndef BTRFS_IOC_DEVICES_READY
+#define BTRFS_IOC_DEVICES_READY _IOR(BTRFS_IOCTL_MAGIC, 39, \
+                                 struct btrfs_ioctl_vol_args)
 #endif
 
 #ifndef BTRFS_SUPER_MAGIC

diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index 49fa16559f61d310e1253e47421616f1f2b8a264..2e2112fd92344f67e907d88f8ea816f7a9ca7d07 100644 (file)
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -31,8 +31,6 @@
 #include "missing.h"
 #include "udev.h"
 
-#define BTRFS_IOC_DEVICES_READY _IOR(BTRFS_IOCTL_MAGIC, 39, struct btrfs_ioctl_vol_args)
-
 static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool test) {
         struct  btrfs_ioctl_vol_args args;
         _cleanup_close_ int fd = -1;