Revert "UBUNTU: SAUCE: aufs -- Convert to use xattr handlers"

[mirror_ubuntu-zesty-kernel.git] / block / scsi_ioctl.c

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 0774799942e06a8d890a5c88e40990cd53a15037..80cbf534e084566a43b956a5c286416835d03b11 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -28,7 +28,10 @@
 #include <linux/slab.h>
 #include <linux/times.h>
 #include <linux/uio.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
+#include <linux/fd.h>
+#include <linux/raid/md_u.h>
+#include <linux/mtio.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_ioctl.h>
@@ -182,6 +185,9 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
        __set_bit(WRITE_16, filter->write_ok);
        __set_bit(WRITE_LONG, filter->write_ok);
        __set_bit(WRITE_LONG_2, filter->write_ok);
+       __set_bit(WRITE_SAME, filter->write_ok);
+       __set_bit(WRITE_SAME_16, filter->write_ok);
+       __set_bit(WRITE_SAME_32, filter->write_ok);
        __set_bit(ERASE, filter->write_ok);
        __set_bit(GPCMD_MODE_SELECT_10, filter->write_ok);
        __set_bit(MODE_SELECT, filter->write_ok);
@@ -705,8 +711,17 @@ int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)
        case SG_GET_RESERVED_SIZE:
        case SG_SET_RESERVED_SIZE:
        case SG_EMULATED_HOST:
+       case BLKFLSBUF:
+       case BLKROSET:
                return 0;
        case CDROM_GET_CAPABILITY:
+       case CDROM_DRIVE_STATUS:
+       case FDGETPRM:
+       case RAID_VERSION:
+       case MTIOCGET:
+#ifdef CONFIG_COMPAT
+       case 0x801c6d02:        /* MTIOCGET32 */
+#endif
                /* Keep this until we remove the printk below.  udev sends it
                 * and we do not want to spam dmesg about it.   CD-ROMs do
                 * not have partitions, so we get here only for disks.