# HG changeset patch

# User rread@ubuntu.eng.hq.xensource.com
# Node ID 86a2de4955f301841fb7d254e9dd5d801d108deb
# Parent  2a2de73f10ef15f396d54e31953e7bc4640e9252
[xen-xo] CA-259 fake out GET_IDLUN scsi ioctl

Signed-off-by: Andrew Peace <andrew.peace@xensource.com>
Signed-off-by: Robert Read <rread@xensource.com>

diff --git a/drivers/xen/blkfront/blkfront.c b/drivers/xen/blkfront/blkfront.c
index 8b9ccae04ecfd30af1c8b8758debd553f02afaec..9b5084ac9378d0dd3fe462684c3dc91a6ded4255 100644 (file)
--- a/drivers/xen/blkfront/blkfront.c
+++ b/drivers/xen/blkfront/blkfront.c
@@ -42,6 +42,7 @@
 #include <linux/interrupt.h>
 #include <linux/scatterlist.h>
 #include <scsi/scsi.h>
+#include <scsi/scsi_ioctl.h>
 #include <xen/evtchn.h>
 #include <xen/xenbus.h>
 #include <xen/interface/grant_table.h>
@@ -543,6 +544,17 @@ int blkif_ioctl(struct inode *inode, struct file *filep,
                                return -EFAULT;
                return 0;
 
+       case SCSI_IOCTL_GET_IDLUN:
+               if (!access_ok(VERIFY_WRITE, argument, 
+                       sizeof(struct scsi_idlun)))
+                       return -EFAULT;
+
+               /* return 0 for now. */
+               __put_user(0, &((struct scsi_idlun __user *)argument)->dev_id);
+               __put_user(0, 
+                       &((struct scsi_idlun __user *)argument)->host_unique_id);
+               return 0;
+
        case CDROM_GET_CAPABILITY: {
                struct blkfront_info *info =
                        inode->i_bdev->bd_disk->private_data;