aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2005-02-02 09:17:21 +0000
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2005-02-02 09:17:21 +0000
commita3eea3d4418aa499f2a1f7f00de011b9f4902cdd (patch)
tree42217dcae5db948b2d48402c708e175b0c497eeb
parent2eb8f64d4ab00206859f777c6779254e7b711cc3 (diff)
downloadxen-a3eea3d4418aa499f2a1f7f00de011b9f4902cdd.tar.gz
xen-a3eea3d4418aa499f2a1f7f00de011b9f4902cdd.tar.bz2
xen-a3eea3d4418aa499f2a1f7f00de011b9f4902cdd.zip
bitkeeper revision 1.1159.223.57 (42009aa1vckOCJ3XiCz8SXnP4BQsFw)
Small hack to make CROMMULTISESSION ioctl return success rather than enosys, like we did on Xen 1.2. From: Anthony Liguori aliguori@us.ibm.com Signed-off-by: ian.pratt@cl.cam.ac.uk
-rw-r--r--linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
index 9216e148e7..e28db67411 100644
--- a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
@@ -223,6 +223,7 @@ int blkif_release(struct inode *inode, struct file *filep)
int blkif_ioctl(struct inode *inode, struct file *filep,
unsigned command, unsigned long argument)
{
+ int i;
/* struct gendisk *gd = inode->i_bdev->bd_disk; */
DPRINTK_IOCTL("command: 0x%x, argument: 0x%lx, dev: 0x%04x\n",
@@ -234,6 +235,12 @@ int blkif_ioctl(struct inode *inode, struct file *filep,
/* return ENOSYS to use defaults */
return -ENOSYS;
+ case CDROMMULTISESSION:
+ DPRINTK("FIXME: support multisession CDs later\n");
+ for ( i = 0; i < sizeof(struct cdrom_multisession); i++ )
+ if ( put_user(0, (byte *)(argument + i)) ) return -EFAULT;
+ return 0;
+
default:
printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
command);