Jan Beulich
2010-Sep-21 13:55 UTC
[Xen-devel] [PATCH] linux/blkfront: forward unknown IOCTLs to scsi_cmd_ioctl() for /dev/sdX
Certain utilities (here: parted) expect certain SCSI IOCTLs (here:
SCSI_IOCTL_GET_IDLUN) to not fail on /dev/sdX devices. Rather than
handling them one-by-one, just forward control to scsi_cmd_ioctl().
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- a/drivers/xen/blkfront/blkfront.c
+++ b/drivers/xen/blkfront/blkfront.c
@@ -533,6 +533,7 @@ int blkif_release(struct inode *inode, s
int blkif_ioctl(struct inode *inode, struct file *filep,
unsigned command, unsigned long argument)
{
+ struct blkfront_info *info = inode->i_bdev->bd_disk->private_data;
int i;
DPRINTK_IOCTL("command: 0x%x, argument: 0x%lx, dev: 0x%04x\n",
@@ -568,14 +569,23 @@ int blkif_ioctl(struct inode *inode, str
return 0;
case CDROM_GET_CAPABILITY: {
- struct blkfront_info *info - inode->i_bdev->bd_disk->private_data;
struct gendisk *gd = info->gd;
if (gd->flags & GENHD_FL_CD)
return 0;
return -EINVAL;
}
default:
+ if (info->mi && info->gd) {
+ switch (info->mi->major) {
+ case SCSI_DISK0_MAJOR:
+ case SCSI_DISK1_MAJOR ... SCSI_DISK7_MAJOR:
+ case SCSI_DISK8_MAJOR ... SCSI_DISK15_MAJOR:
+ case SCSI_CDROM_MAJOR:
+ return scsi_cmd_ioctl(filep, info->gd, command,
+ (void __user *)argument);
+ }
+ }
+
/*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
command);*/
return -EINVAL; /* same return as native Linux */
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel