diff options
| author | Filip Bozuta <Filip.Bozuta@syrmia.com> | 2020-09-05 18:38:02 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2020-09-06 12:29:19 +0200 |
| commit | 5d5d17522f59696d18fdbc51984c7b4ebf191f7c (patch) | |
| tree | 00a264e55c14c05e35f82ff31bf4f1c3e27df5a4 | |
| parent | 4d6e318af00eab64977370163404fece78d56ef3 (diff) | |
| download | focaccia-qemu-5d5d17522f59696d18fdbc51984c7b4ebf191f7c.tar.gz focaccia-qemu-5d5d17522f59696d18fdbc51984c7b4ebf191f7c.zip | |
linux-user: Protect btrfs ioctl target definitions
Target definitions of btrfs ioctls in 'syscall_defs.h' use the value BTRFS_IOCTL_MAGIC that is defined header 'btrfs.h'. This header is not available in kernel versions before 3.9. For that reason, these target ioctl definitions should be enwrapped in an #ifdef directive to check whether the 'btrfs.h' header is available as to not cause build errors on older Linux systems. Signed-off-by: Filip Bozuta <Filip.Bozuta@syrmia.com> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20200905163802.2666-1-Filip.Bozuta@syrmia.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | linux-user/syscall_defs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 33a414c50f..731c3d5341 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1006,6 +1006,7 @@ struct target_rtc_pll_info { #define TARGET_FS_IOC32_SETVERSION TARGET_IOW('v', 2, int) /* btrfs ioctls */ +#ifdef CONFIG_BTRFS #define TARGET_BTRFS_IOC_SNAP_CREATE TARGET_IOWU(BTRFS_IOCTL_MAGIC, 1) #define TARGET_BTRFS_IOC_SCAN_DEV TARGET_IOWU(BTRFS_IOCTL_MAGIC, 4) #define TARGET_BTRFS_IOC_FORGET_DEV TARGET_IOWU(BTRFS_IOCTL_MAGIC, 5) @@ -1041,6 +1042,7 @@ struct target_rtc_pll_info { #define TARGET_BTRFS_IOC_GET_SUBVOL_INFO TARGET_IORU(BTRFS_IOCTL_MAGIC, 60) #define TARGET_BTRFS_IOC_GET_SUBVOL_ROOTREF TARGET_IOWRU(BTRFS_IOCTL_MAGIC, 61) #define TARGET_BTRFS_IOC_INO_LOOKUP_USER TARGET_IOWRU(BTRFS_IOCTL_MAGIC, 62) +#endif /* usb ioctls */ #define TARGET_USBDEVFS_CONTROL TARGET_IOWRU('U', 0) |