bitkeeper revision 1.1159.258.13 (421e7cfaHXBVrm-2XYB50x2aleoG0A)

From: Jari Ruusu via Pasi Kärkkäinen [pasik@iki.fi]

Small fix to 2.4 blkfront such that the capacity is reported correctly.
Does 2.6 need a similar fix?

Signed-off-by: ian@xensource.com

diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c b/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c
index e5d299ae164336632331a63f1e79b9af5b8bf22b..74a43cdd4aef535abacd2389620985ab98445a69 100644 (file)
--- a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c
+++ b/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/vbd.c
@@ -288,7 +288,7 @@ static int xlvbd_init_device(vdisk_t *xd)
         /* Need to skankily setup 'partition' information */
         gd->part[minor].start_sect = 0; 
         gd->part[minor].nr_sects   = capacity; 
-        gd->sizes[minor]           = capacity; 
+        gd->sizes[minor]           = capacity >>(BLOCK_SIZE_BITS-9); 
 
         gd->flags[minor >> gd->minor_shift] |= GENHD_FL_VIRT_PARTNS;
     }