Merge tag 'for-5.6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

[linux.git] / drivers / ide / ide-floppy_ioctl.c

diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index 40a2ebe34e1d4f9ed9bed0eacde1d478399eeedd..39a790ac6cc305b023874a1c2af78a98a38c579c 100644 (file)
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -5,6 +5,7 @@
 
 #include <linux/kernel.h>
 #include <linux/ide.h>
+#include <linux/compat.h>
 #include <linux/cdrom.h>
 #include <linux/mutex.h>
 
@@ -302,3 +303,37 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct block_device *bdev,
        mutex_unlock(&ide_floppy_ioctl_mutex);
        return err;
 }
+
+#ifdef CONFIG_COMPAT
+int ide_floppy_compat_ioctl(ide_drive_t *drive, struct block_device *bdev,
+                           fmode_t mode, unsigned int cmd, unsigned long arg)
+{
+       struct ide_atapi_pc pc;
+       void __user *argp = compat_ptr(arg);
+       int err;
+
+       mutex_lock(&ide_floppy_ioctl_mutex);
+       if (cmd == CDROMEJECT || cmd == CDROM_LOCKDOOR) {
+               err = ide_floppy_lockdoor(drive, &pc, arg, cmd);
+               goto out;
+       }
+
+       err = ide_floppy_format_ioctl(drive, &pc, mode, cmd, argp);
+       if (err != -ENOTTY)
+               goto out;
+
+       /*
+        * skip SCSI_IOCTL_SEND_COMMAND (deprecated)
+        * and CDROM_SEND_PACKET (legacy) ioctls
+        */
+       if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
+               err = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
+
+       if (err == -ENOTTY)
+               err = generic_ide_ioctl(drive, bdev, cmd, arg);
+
+out:
+       mutex_unlock(&ide_floppy_ioctl_mutex);
+       return err;
+}
+#endif