X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-btrfs.c;h=3352821567e405723ab6287bd0dbf4decca48bb3;hb=113b3fc1a8061f4a24dd0db74e9a3cd0083b2251;hp=dfb05525ad8ee5b5cc7a4b87d86b161af4f9560a;hpb=f274ece0f76b5709408821e317e87aef76123db6;p=elogind.git
diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index dfb05525a..335282156 100644
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -17,44 +17,35 @@
along with systemd; If not, see .
***/
-#include
#include
-#include
-#include
#include
-#include
#include
-#include "udev.h"
+#ifdef HAVE_LINUX_BTRFS_H
+#include
+#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;
- 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;
}