Message ID | 1578947683-21011-12-git-send-email-aleksandar.markovic@rt-rk.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | linux-user: Misc patches for 5.0 | expand |
Le 13/01/2020 à 21:34, Aleksandar Markovic a écrit : > From: Aleksandar Markovic <amarkovic@wavecomp.com> > > These FS_IOC32_<GET|SET>VERSION ioctls are identical to > FS_IOC_<GET|SET>VERSION ioctls, but without the anomaly of their > number defined as if their third argument is of type long, while > it is treated internally in kernel as is of type int. > > Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com> > --- > linux-user/ioctls.h | 2 ++ > linux-user/syscall_defs.h | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h > index 4fd6939..3affd88 100644 > --- a/linux-user/ioctls.h > +++ b/linux-user/ioctls.h > @@ -142,6 +142,8 @@ > IOCTL(FS_IOC_SETVERSION, IOC_W, MK_PTR(TYPE_INT)) > IOCTL(FS_IOC32_GETFLAGS, IOC_R, MK_PTR(TYPE_INT)) > IOCTL(FS_IOC32_SETFLAGS, IOC_W, MK_PTR(TYPE_INT)) > + IOCTL(FS_IOC32_GETVERSION, IOC_R, MK_PTR(TYPE_INT)) > + IOCTL(FS_IOC32_SETVERSION, IOC_W, MK_PTR(TYPE_INT)) > > #ifdef CONFIG_USBFS > /* USB ioctls */ > diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h > index 964b2b4..a73cc3d 100644 > --- a/linux-user/syscall_defs.h > +++ b/linux-user/syscall_defs.h > @@ -922,6 +922,8 @@ struct target_pollfd { > #define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap) > #define TARGET_FS_IOC32_GETFLAGS TARGET_IOR('f', 1, int) > #define TARGET_FS_IOC32_SETFLAGS TARGET_IOW('f', 2, int) > +#define TARGET_FS_IOC32_GETVERSION TARGET_IOR('v', 1, int) > +#define TARGET_FS_IOC32_SETVERSION TARGET_IOW('v', 2, int) > > /* usb ioctls */ > #define TARGET_USBDEVFS_CONTROL TARGET_IOWRU('U', 0) > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index 4fd6939..3affd88 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -142,6 +142,8 @@ IOCTL(FS_IOC_SETVERSION, IOC_W, MK_PTR(TYPE_INT)) IOCTL(FS_IOC32_GETFLAGS, IOC_R, MK_PTR(TYPE_INT)) IOCTL(FS_IOC32_SETFLAGS, IOC_W, MK_PTR(TYPE_INT)) + IOCTL(FS_IOC32_GETVERSION, IOC_R, MK_PTR(TYPE_INT)) + IOCTL(FS_IOC32_SETVERSION, IOC_W, MK_PTR(TYPE_INT)) #ifdef CONFIG_USBFS /* USB ioctls */ diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 964b2b4..a73cc3d 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -922,6 +922,8 @@ struct target_pollfd { #define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap) #define TARGET_FS_IOC32_GETFLAGS TARGET_IOR('f', 1, int) #define TARGET_FS_IOC32_SETFLAGS TARGET_IOW('f', 2, int) +#define TARGET_FS_IOC32_GETVERSION TARGET_IOR('v', 1, int) +#define TARGET_FS_IOC32_SETVERSION TARGET_IOW('v', 2, int) /* usb ioctls */ #define TARGET_USBDEVFS_CONTROL TARGET_IOWRU('U', 0)