---

yaml --- r: 82830 b: refs/heads/master c: 135da0b h: refs/heads/master v: v3
git-mirror · Feb 4, 2008 · 488b169 · 488b169
1 parent 039ef74
commit 488b169
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c0cd7c000dc0851035c5003bf9d47733d0b257b
+refs/heads/master: 135da0b037984c0284acdf40aaf4f7f31eb5cbd0
diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c
@@ -152,9 +152,20 @@ static int virtblk_ioctl(struct inode *inode, struct file *filp,
 			      (void __user *)data);
 }
 
+/* We provide getgeo only to please some old bootloader/partitioning tools */
+static int virtblk_getgeo(struct block_device *bd, struct hd_geometry *geo)
+{
+	/* some standard values, similar to sd */
+	geo->heads = 1 << 6;
+	geo->sectors = 1 << 5;
+	geo->cylinders = get_capacity(bd->bd_disk) >> 11;
+	return 0;
+}
+
 static struct block_device_operations virtblk_fops = {
-	.ioctl = virtblk_ioctl,
-	.owner = THIS_MODULE,
+	.ioctl  = virtblk_ioctl,
+	.owner  = THIS_MODULE,
+	.getgeo = virtblk_getgeo,
 };
 
 static int virtblk_probe(struct virtio_device *vdev)