[PATCH] Update ioctl entries from linux v5.8

Dmitry V. Levin ldv at altlinux.org
Wed Jul 8 06:57:41 UTC 2020


On Tue, Jul 07, 2020 at 12:52:24AM +0300, Gleb Fotengauer-Malinovskiy wrote:
> * linux/32/ioctls_inc_align16.h: Update from linux v5.8-rc4
> using ioctls_gen.sh.
> * linux/32/ioctls_inc_align32.h: Likewise.
> * linux/32/ioctls_inc_align64.h: Likewise.
> * linux/64/ioctls_inc.h: Likewise.
> * linux/x32/ioctls_inc0.h: Likewise.
> * linux/powerpc/ioctls_arch0.h: Likewise.
> * NEWS: Mention this.

Thanks, applied with the following addition:

diff --git a/tests/ioctl_loop.c b/tests/ioctl_loop.c
index 61300e90e..c8ad61efd 100644
--- a/tests/ioctl_loop.c
+++ b/tests/ioctl_loop.c
@@ -178,12 +178,12 @@ main(void)
 	       _IOC_SIZE((unsigned int) unknown_loop_cmd),
 	       (unsigned long) magic);
 
-	sys_ioctl(-1, LOOP_SET_BLOCK_SIZE + 1, magic);
+	sys_ioctl(-1, LOOP_CONFIGURE + 1, magic);
 	printf("ioctl(-1, _IOC(%s, 0x4c, %#x, %#x), %#lx) = "
 	       "-1 EBADF (%m)\n",
 	       _IOC_NONE ? "0" : "_IOC_NONE",
-	       _IOC_NR(LOOP_SET_BLOCK_SIZE + 1),
-	       _IOC_SIZE(LOOP_SET_BLOCK_SIZE + 1),
+	       _IOC_NR(LOOP_CONFIGURE + 1),
+	       _IOC_SIZE(LOOP_CONFIGURE + 1),
 	       (unsigned long) magic);
 
 	sys_ioctl(-1, LOOP_CTL_GET_FREE + 1, magic);

-- 
ldv


More information about the Strace-devel mailing list