direct-io.hg

changeset 5049:04626a6c01f1

bitkeeper revision 1.1489 (428e15d0U1QR0C-3P4GEGl1TSQ6Plg)

Manual merge.
author kaf24@firebug.cl.cam.ac.uk
date Fri May 20 16:52:32 2005 +0000 (2005-05-20)
parents 636f2a45038f 574892590001
children 6cc3680e98d1
files linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
line diff
     2.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c	Fri May 20 15:23:48 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c	Fri May 20 16:52:32 2005 +0000
     2.3 @@ -256,9 +256,9 @@ int blkif_ioctl(struct inode *inode, str
     2.4          return 0;
     2.5  
     2.6      default:
     2.7 -        printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
     2.8 -               command);
     2.9 -        return -ENOSYS;
    2.10 +        /*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
    2.11 +          command);*/
    2.12 +        return -EINVAL; /* same return as native Linux */
    2.13      }
    2.14  
    2.15      return 0;