chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
src
/
udev
/
udev-builtin-btrfs.c
diff --git
a/src/udev/udev-builtin-btrfs.c
b/src/udev/udev-builtin-btrfs.c
index 4e80a1d1d14407c7b82ff05fdb74ddc922e646ef..3643596a70220518ff2b026fcba7594dd8494bd7 100644
(file)
--- a/
src/udev/udev-builtin-btrfs.c
+++ b/
src/udev/udev-builtin-btrfs.c
@@
-25,18
+25,15
@@
#include <errno.h>
#include <sys/ioctl.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) {
static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool test) {
- struct
btrfs_ioctl_vol_args args
;
+ struct
btrfs_ioctl_vol_args args = {}
;
_cleanup_close_ int fd = -1;
int err;
_cleanup_close_ int fd = -1;
int err;
@@
-52,7
+49,7
@@
static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool t
if (err < 0)
return EXIT_FAILURE;
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;
}
return EXIT_SUCCESS;
}