aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2003-05-01 15:30:02 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2003-05-01 15:30:02 +0000
commit73976ddd5827ffe188dafdfa1d6ed4fdc639283b (patch)
tree803d7099f8074af0d25fda51214aa5143d24b046
parent12e2968e450ebca15f97405b352cc0216663dcb8 (diff)
downloadxen-73976ddd5827ffe188dafdfa1d6ed4fdc639283b.tar.gz
xen-73976ddd5827ffe188dafdfa1d6ed4fdc639283b.tar.bz2
xen-73976ddd5827ffe188dafdfa1d6ed4fdc639283b.zip
bitkeeper revision 1.199 (3eb13d7aaFLvrWm2Gy0oHRZ0KyIWNw)
xl_block.c: Fix xenolinux blkdev ioctl handling. Handle multisession probing in a simple manner (always say NOT multisession :-).
-rw-r--r--xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c
index 6968df42b0..d3e09eb52c 100644
--- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c
+++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c
@@ -7,6 +7,7 @@
#include "xl_block.h"
#include <linux/blk.h>
+#include <linux/cdrom.h>
typedef unsigned char byte; /* from linux/ide.h */
@@ -223,9 +224,15 @@ int xenolinux_block_ioctl(struct inode *inode, struct file *filep,
if (put_user(0x106, (unsigned int *) &geo->cylinders)) return -EFAULT;
return 0;
+ case CDROMMULTISESSION:
+ printk("FIXME: support multisession CDs later\n");
+ memset((struct cdrom_multisession *)argument, 0,
+ sizeof(struct cdrom_multisession));
+ return 0;
+
default:
- DPRINTK_IOCTL(" eh? unknown ioctl\n");
- break;
+ printk("ioctl %08x not supported by xl_block\n", command);
+ return -ENOSYS;
}
return 0;