X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-btrfs.c;h=74b220928ecd7dba17df0426f238ea3ec8bbd803;hb=679bda6a739fbd0b5c9eca04f20fdd48bf8c006d;hp=dfb05525ad8ee5b5cc7a4b87d86b161af4f9560a;hpb=c3cfed0d6cd9f537aa998096a43b80e98d99c6c4;p=elogind.git

diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index dfb05525a..74b220928 100644
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -25,32 +25,27 @@
 #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;
-        int fd;
+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;
 
         if (argc != 3 || !streq(argv[1], "ready"))
                 return EXIT_FAILURE;
 
-        fd = open("/dev/btrfs-control", O_RDWR);
+        fd = open("/dev/btrfs-control", O_RDWR|O_CLOEXEC);
         if (fd < 0)
                 return EXIT_FAILURE;
 
-        util_strscpy(args.name, sizeof(args.name), argv[2]);
+        strscpy(args.name, sizeof(args.name), argv[2]);
         err = ioctl(fd, BTRFS_IOC_DEVICES_READY, &args);
-        close(fd);
         if (err < 0)
                 return EXIT_FAILURE;