From 3034b03d46a3340d978bc0dc1cde0ebc6825c8b8 Mon Sep 17 00:00:00 2001 From: "ach61@labyrinth.cl.cam.ac.uk" Date: Mon, 28 Apr 2003 12:58:45 +0000 Subject: bitkeeper revision 1.187 (3ead25859Pbawg2pQ_-rP3ATdde0_Q) additional debugging --- xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c | 6 ++++++ xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'xenolinux-2.4.21-pre4-sparse') 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 9de2f0bf96..6e66845c84 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 @@ -120,6 +120,11 @@ int xenolinux_block_release(struct inode *inode, struct file *filep) return 0; } +/* + * handle ioctl calls + * + * individual ioctls are defined in /usr/include/linux/fs.h + */ int xenolinux_block_ioctl(struct inode *inode, struct file *filep, unsigned command, unsigned long argument) @@ -299,6 +304,7 @@ static int hypervisor_request(unsigned long id, case XEN_BLOCK_WRITE: phys_device = xldev_to_physdev(device); gd = xldev_to_gendisk(device); + sector_number += gd->part[MINOR(device)].start_sect; if ( (sg_operation == operation) && (sg_dev == phys_device) && diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.h b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.h index 3d219eeedc..bc6432b778 100644 --- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.h +++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.h @@ -29,9 +29,13 @@ #if 0 #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a ) -#define DPRINTK_IOCTL(_f, _a...) printk ( KERN_ALERT _f , ## _a ) #else #define DPRINTK(_f, _a...) ((void)0) +#endif + +#if 0 +#define DPRINTK_IOCTL(_f, _a...) printk ( KERN_ALERT _f , ## _a ) +#else #define DPRINTK_IOCTL(_f, _a...) ((void)0) #endif -- cgit v1.2.3