[PATCH] Add block_device_operations.getgeo block device method

HDIO_GETGEO is implemented in most block drivers, and all of them have to
duplicate the code to copy the structure to userspace, as well as getting
the start sector.  This patch moves that to common code [1] and adds a
->getgeo method to fill out the raw kernel hd_geometry structure.  For many
drivers this means ->ioctl can go away now.

[1] the s390 block drivers are odd in this respect.  xpram sets ->start
    to 4 always which seems more than odd, and the dasd driver shifts
    the start offset around, probably because of it's non-standard
    sector size.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@suse.de>
Cc: <mike.miller@hp.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 15 insertions, 26 deletions

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 0f48301342da..15299e7a1ade 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -809,34 +809,23 @@ static int mm_revalidate(struct gendisk *disk)
         set_capacity(disk, card->mm_size << 1);
         return 0;
 }
-/*
------------------------------------------------------------------------------------
---                            mm_ioctl
------------------------------------------------------------------------------------
-*/
-static int mm_ioctl(struct inode *i, struct file *f, unsigned int cmd, unsigned long arg)
+
+static int mm_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 {
-        if (cmd == HDIO_GETGEO) {
-                struct cardinfo *card = i->i_bdev->bd_disk->private_data;
-                int size = card->mm_size * (1024 / MM_HARDSECT);
-                struct hd_geometry geo;
-                /*
-                 * get geometry: we have to fake one...  trim the size to a
-                 * multiple of 2048 (1M): tell we have 32 sectors, 64 heads,
-                 * whatever cylinders.
-                 */
-                geo.heads     = 64;
-                geo.sectors   = 32;
-                geo.start     = get_start_sect(i->i_bdev);
-                geo.cylinders = size / (geo.heads * geo.sectors);
-
-                if (copy_to_user((void __user *) arg, &geo, sizeof(geo)))
-                        return -EFAULT;
-                return 0;
-        }
+        struct cardinfo *card = bdev->bd_disk->private_data;
+        int size = card->mm_size * (1024 / MM_HARDSECT);
 
-        return -EINVAL;
+        /*
+         * get geometry: we have to fake one...  trim the size to a
+         * multiple of 2048 (1M): tell we have 32 sectors, 64 heads,
+         * whatever cylinders.
+         */
+        geo->heads     = 64;
+        geo->sectors   = 32;
+        geo->cylinders = size / (geo->heads * geo->sectors);
+        return 0;
 }
+
 /*
 -----------------------------------------------------------------------------------
 --                                mm_check_change
@@ -855,7 +844,7 @@ static int mm_check_change(struct gendisk *disk)
 */
 static struct block_device_operations mm_fops = {
         .owner          = THIS_MODULE,
-        .ioctl          = mm_ioctl,
+        .getgeo         = mm_getgeo,
         .revalidate_disk= mm_revalidate,
         .media_changed  = mm_check_change,
 };