X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-btrfs.c;h=3352821567e405723ab6287bd0dbf4decca48bb3;hb=62a30b2c490512fe22a4e5faacb1d55763ead1e0;hp=2baafe61310495ce1bb184ab025a45b5c9cab8aa;hpb=c8a202b7d47f9d6bba3100a208abdadfc383499e;p=elogind.git

diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index 2baafe613..335282156 100644
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -17,27 +17,19 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <sys/ioctl.h>
 
-#include "udev.h"
+#ifdef HAVE_LINUX_BTRFS_H
+#include <linux/btrfs.h>
+#endif
 
-#define BTRFS_PATH_NAME_MAX 4087
-struct btrfs_ioctl_vol_args {
-        int64_t fd;
-        char name[BTRFS_PATH_NAME_MAX + 1];
-};
-#define BTRFS_IOCTL_MAGIC 0x94
-#define BTRFS_IOC_DEVICES_READY _IOR(BTRFS_IOCTL_MAGIC, 39, struct btrfs_ioctl_vol_args)
+#include "missing.h"
+#include "udev.h"
 
-static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool test)
-{
-        struct  btrfs_ioctl_vol_args 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;
         int err;
 
@@ -53,7 +45,7 @@ static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool t
         if (err < 0)
                 return EXIT_FAILURE;
 
-        udev_builtin_add_property(dev, test, "ID_BTRFS_READY", err == 0 ? "1" : "0");
+        udev_builtin_add_property(dev, test, "ID_BTRFS_READY", one_zero(err == 0));
         return EXIT_SUCCESS;
 }