shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

Move BTRFS_IOC_DEVICES_READY to missing.h

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-08-03 00:27:25 -04:00
parent dced15575f
commit 7bed7f0e3b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/shared/missing.h
View File

@ -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

2
src/udev/udev-builtin-btrfs.c
View File

@ -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;