Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21a9d4c9 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

sd: fix up ->compat_ioctl 



No need to verify the passthrough ioctls, the real handler will
take care of that.  Also make sure not to block for resets on
O_NONBLOCK fds.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent 906d15fb

drivers/scsi/sd.c

+8 −20
Original line number Diff line number Diff line
@@ -1541,31 +1541,19 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode, 
			   unsigned int cmd, unsigned long arg)

{

	struct scsi_device *sdev = scsi_disk(bdev->bd_disk)->device;

	int ret;



	ret = scsi_verify_blk_ioctl(bdev, cmd);

	if (ret < 0)

		return ret;



	/*

	 * If we are in the middle of error recovery, don't let anyone

	 * else try and use this device.  Also, if error recovery fails, it

	 * may try and take the device offline, in which case all further

	 * access to the device is prohibited.

	 */

	if (!scsi_block_when_processing_errors(sdev))

		return -ENODEV;

	       

	if (sdev->host->hostt->compat_ioctl) {

		ret = sdev->host->hostt->compat_ioctl(sdev, cmd, (void __user *)arg);

	int error;



		return ret;

	}

	error = scsi_ioctl_block_when_processing_errors(sdev, cmd,

			(mode & FMODE_NDELAY) != 0);

	if (error)

		return error;

	       

	/* 

	 * Let the static ioctl translation table take care of it.

	 */

	if (!sdev->host->hostt->compat_ioctl)

		return -ENOIOCTLCMD; 

	return sdev->host->hostt->compat_ioctl(sdev, cmd, (void __user *)arg);

}

#endif