diff mbox series

[v2,01/27] pktcdvd: fix regression on 64-bit architectures

Message ID	20191217221708.3730997-2-arnd@arndb.de (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=u/1V=2H=vger.kernel.org=linux-fsdevel-owner@kernel.org> From: Arnd Bergmann <arnd@arndb.de> To: Jens Axboe <axboe@kernel.dk>, "James E.J. Bottomley" <jejb@linux.ibm.com>, "Martin K. Petersen" <martin.petersen@oracle.com> Cc: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org, y2038@lists.linaro.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Ben Hutchings <ben.hutchings@codethink.co.uk>, linux-doc@vger.kernel.org, corbet@lwn.net, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de> Subject: [PATCH v2 01/27] pktcdvd: fix regression on 64-bit architectures Date: Tue, 17 Dec 2019 23:16:42 +0100 Message-Id: <20191217221708.3730997-2-arnd@arndb.de> In-Reply-To: <20191217221708.3730997-1-arnd@arndb.de> References: <20191217221708.3730997-1-arnd@arndb.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk
Series	[v2,01/27] pktcdvd: fix regression on 64-bit architectures \| expand [v2,01/27] pktcdvd: fix regression on 64-bit architectures [v2,02/27] compat_ioctl: block: handle BLKREPORTZONE/BLKRESETZONE [v2,03/27] compat_ioctl: block: handle BLKGETZONESZ/BLKGETNRZONES [v2,04/27] compat_ioctl: block: handle add zone open, close and finish ioctl [v2,05/27] compat_ioctl: block: handle Persistent Reservations [v2,06/27] compat: ARM64: always include asm-generic/compat.h [v2,07/27] compat: provide compat_ptr() on all architectures [v2,08/27] compat: scsi: sg: fix v3 compat read/write interface [v2,09/27] compat_ioctl: block: add blkdev_compat_ptr_ioctl [v2,10/27] compat_ioctl: ubd, aoe: use blkdev_compat_ptr_ioctl [v2,11/27] compat_ioctl: move CDROM_SEND_PACKET handling into scsi [v2,12/27] compat_ioctl: move CDROMREADADIO to cdrom.c [v2,13/27] compat_ioctl: cdrom: handle CDROM_LAST_WRITTEN [v2,14/27] compat_ioctl: block: handle cdrom compat ioctl in non-cdrom drivers [v2,15/27] compat_ioctl: add scsi_compat_ioctl [v2,16/27] compat_ioctl: bsg: add handler [v2,17/27] compat_ioctl: ide: floppy: add handler [v2,18/27] compat_ioctl: scsi: move ioctl handling into drivers [v2,19/27] compat_ioctl: move sys_compat_ioctl() to ioctl.c [v2,20/27] compat_ioctl: simplify the implementation [v2,21/27] compat_ioctl: move cdrom commands into cdrom.c [v2,22/27] compat_ioctl: scsi: handle HDIO commands from drivers [v2,23/27] compat_ioctl: move HDIO ioctl handling into drivers/ide [v2,24/27] compat_ioctl: block: move blkdev_compat_ioctl() into ioctl.c [v2,25/27] compat_ioctl: block: simplify compat_blkpg_ioctl() [v2,26/27] compat_ioctl: simplify up block/ioctl.c [v2,27/27] Documentation: document ioctl interfaces better

Commit Message

Arnd Bergmann Dec. 17, 2019, 10:16 p.m. UTC

The support for the compat ioctl did not actually do what it was
supposed to do because of a typo, instead it broke native support for
CDROM_LAST_WRITTEN and CDROM_SEND_PACKET on all architectures with
CONFIG_COMPAT enabled.

Fixes: 1b114b0817cc ("pktcdvd: add compat_ioctl handler")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
----
Please apply for v5.5, I just noticed the regression while
rebasing some of the patches I created on top.
---
 drivers/block/pktcdvd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index ee67bf929fac..861fc65a1b75 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2707,7 +2707,7 @@  static const struct block_device_operations pktcdvd_ops = {
 	.release =		pkt_close,
 	.ioctl =		pkt_ioctl,
 #ifdef CONFIG_COMPAT
-	.ioctl =		pkt_compat_ioctl,
+	.compat_ioctl =		pkt_compat_ioctl,
 #endif
 	.check_events =		pkt_check_events,
 };