ia64/xen-unstable
changeset 1108:a98fbec887fb
bitkeeper revision 1.737.1.1 (403a1730qLBq2f5sC8r2V-xGglU9eQ)
Merge ssh://srg//homes/maw48/xeno-unstable-ioctl.bk
into equilibrium.research.intel-research.net:/home/irchomes/mwilli2/currentsrc/xeno.bk
Merge ssh://srg//homes/maw48/xeno-unstable-ioctl.bk
into equilibrium.research.intel-research.net:/home/irchomes/mwilli2/currentsrc/xeno.bk
author | mwilli2@equilibrium.research.intel-research.net |
---|---|
date | Mon Feb 23 15:07:28 2004 +0000 (2004-02-23) |
parents | 8870c27357dd 951b8af20192 |
children | b60db76b91ba |
files | BitKeeper/etc/logging_ok xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c |
line diff
1.1 --- a/BitKeeper/etc/logging_ok Mon Feb 23 13:57:02 2004 +0000 1.2 +++ b/BitKeeper/etc/logging_ok Mon Feb 23 15:07:28 2004 +0000 1.3 @@ -21,6 +21,7 @@ kaf24@scramble.cl.cam.ac.uk 1.4 kaf24@striker.cl.cam.ac.uk 1.5 laudney@eclipse.(none) 1.6 lynx@idefix.cl.cam.ac.uk 1.7 +mwilli2@equilibrium.research.intel-research.net 1.8 rac61@labyrinth.cl.cam.ac.uk 1.9 rgr22@boulderdash.cl.cam.ac.uk 1.10 rn@wyvis.camb.intel-research.net
2.1 --- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c Mon Feb 23 13:57:02 2004 +0000 2.2 +++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c Mon Feb 23 15:07:28 2004 +0000 2.3 @@ -164,6 +164,11 @@ int xenolinux_block_ioctl(struct inode * 2.4 DPRINTK_IOCTL(" BLKGETSIZE: %x %lx\n", BLKGETSIZE, part->nr_sects); 2.5 return put_user(part->nr_sects, (unsigned long *) argument); 2.6 2.7 + case BLKGETSIZE64: 2.8 + DPRINTK_IOCTL(" BLKGETSIZE64: %x %llx\n", BLKGETSIZE64, 2.9 + (u64)part->nr_sects * 512); 2.10 + return put_user((u64)part->nr_sects * 512, (u64 *) argument); 2.11 + 2.12 case BLKRRPART: /* re-read partition table */ 2.13 DPRINTK_IOCTL(" BLKRRPART: %x\n", BLKRRPART); 2.14 return xenolinux_block_revalidate(dev);