diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-03 00:27:25 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-03 00:28:12 -0400 |
| commit | 7bed7f0e3b1f9596aedb64657e432e5b267adebb (patch) | |
| tree | 1a419855328274f8d5d827c7712c67391ef44a1b /src | |
| parent | dced15575f7bf172e3c9d798c43477539525558c (diff) | |
Move BTRFS_IOC_DEVICES_READY to missing.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/missing.h | 10 | ||||
| -rw-r--r-- | src/udev/udev-builtin-btrfs.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/shared/missing.h b/src/shared/missing.h index d54cc1efe2..e20f9bdfd3 100644 --- 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 49fa16559f..2e2112fd92 100644 --- 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; |