ia64/xen-unstable

changeset 3609:d49c0626928e

bitkeeper revision 1.1159.212.69 (42009c14_wjFIPRo2s6br4oGS3Ln-w)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author iap10@labyrinth.cl.cam.ac.uk
date Wed Feb 02 09:23:32 2005 +0000 (2005-02-02)
parents fd1dd0663b09 17e50d7ed675
children 36fa617b88a7
files linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c	Wed Feb 02 00:26:53 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c	Wed Feb 02 09:23:32 2005 +0000
     1.3 @@ -218,6 +218,7 @@ int blkif_release(struct inode *inode, s
     1.4  int blkif_ioctl(struct inode *inode, struct file *filep,
     1.5                  unsigned command, unsigned long argument)
     1.6  {
     1.7 +	int i;
     1.8      /*  struct gendisk *gd = inode->i_bdev->bd_disk; */
     1.9  
    1.10      DPRINTK_IOCTL("command: 0x%x, argument: 0x%lx, dev: 0x%04x\n",
    1.11 @@ -229,6 +230,12 @@ int blkif_ioctl(struct inode *inode, str
    1.12          /* return ENOSYS to use defaults */
    1.13          return -ENOSYS;
    1.14  
    1.15 +    case CDROMMULTISESSION:
    1.16 +        DPRINTK("FIXME: support multisession CDs later\n");
    1.17 +        for ( i = 0; i < sizeof(struct cdrom_multisession); i++ )
    1.18 +            if ( put_user(0, (byte *)(argument + i)) ) return -EFAULT;
    1.19 +        return 0;
    1.20 +
    1.21      default:
    1.22          printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
    1.23                 command);