From: Sasha Levin Date: Fri, 25 Oct 2019 01:34:05 +0000 (-0400) Subject: fixes for 4.14 X-Git-Tag: v4.4.198~47^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c95ee2c282f72c1e80781b998feaac2bfd8dcf68;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/loop-add-loop_set_direct_io-to-compat-ioctl.patch b/queue-4.14/loop-add-loop_set_direct_io-to-compat-ioctl.patch new file mode 100644 index 00000000000..70eebdaddde --- /dev/null +++ b/queue-4.14/loop-add-loop_set_direct_io-to-compat-ioctl.patch @@ -0,0 +1,42 @@ +From a1b6585cd1aebddb23ef0eaf791740556030849b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Oct 2019 18:17:36 +0100 +Subject: loop: Add LOOP_SET_DIRECT_IO to compat ioctl + +From: Alessio Balsini + +[ Upstream commit fdbe4eeeb1aac219b14f10c0ed31ae5d1123e9b8 ] + +Enabling Direct I/O with loop devices helps reducing memory usage by +avoiding double caching. 32 bit applications running on 64 bits systems +are currently not able to request direct I/O because is missing from the +lo_compat_ioctl. + +This patch fixes the compatibility issue mentioned above by exporting +LOOP_SET_DIRECT_IO as additional lo_compat_ioctl() entry. +The input argument for this ioctl is a single long converted to a 1-bit +boolean, so compatibility is preserved. + +Cc: Jens Axboe +Signed-off-by: Alessio Balsini +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/loop.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/block/loop.c b/drivers/block/loop.c +index 87d7c42affbc4..ec61dd873c93d 100644 +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -1605,6 +1605,7 @@ static int lo_compat_ioctl(struct block_device *bdev, fmode_t mode, + arg = (unsigned long) compat_ptr(arg); + case LOOP_SET_FD: + case LOOP_CHANGE_FD: ++ case LOOP_SET_DIRECT_IO: + err = lo_ioctl(bdev, mode, cmd, arg); + break; + default: +-- +2.20.1 + diff --git a/queue-4.14/series b/queue-4.14/series index dcf7b0b9d68..6ef88de5451 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -18,3 +18,4 @@ revert-drm-radeon-fix-eeh-during-kexec.patch ocfs2-fix-panic-due-to-ocfs2_wq-is-null.patch mips-treat-loongson-extensions-as-ases.patch mips-elf_hwcap-export-userspace-ases.patch +loop-add-loop_set_direct_io-to-compat-ioctl.patch