[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, 11 insertions, 12 deletions

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 0acbfff8ad28..cb2a545e57dc 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1424,6 +1424,16 @@ static void do_fd_request(request_queue_t * q)
         redo_fd_request();
 }
 
+static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
+{
+        int drive = MINOR(bdev->bd_dev) & 3;
+
+        geo->heads = unit[drive].type->heads;
+        geo->sectors = unit[drive].dtype->sects * unit[drive].type->sect_mult;
+        geo->cylinders = unit[drive].type->tracks;
+        return 0;
+}
+
 static int fd_ioctl(struct inode *inode, struct file *filp,
                     unsigned int cmd, unsigned long param)
 {
@@ -1431,18 +1441,6 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
         static struct floppy_struct getprm;
 
         switch(cmd){
-        case HDIO_GETGEO:
-        {
-                struct hd_geometry loc;
-                loc.heads = unit[drive].type->heads;
-                loc.sectors = unit[drive].dtype->sects * unit[drive].type->sect_mult;
-                loc.cylinders = unit[drive].type->tracks;
-                loc.start = 0;
-                if (copy_to_user((void *)param, (void *)&loc,
-                                 sizeof(struct hd_geometry)))
-                        return -EFAULT;
-                break;
-        }
         case FDFMTBEG:
                 get_fdc(drive);
                 if (fd_ref[drive] > 1) {
@@ -1652,6 +1650,7 @@ static struct block_device_operations floppy_fops = {
         .open           = floppy_open,
         .release        = floppy_release,
         .ioctl          = fd_ioctl,
+        .getgeo         = fd_getgeo,
         .media_changed  = amiga_floppy_change,
 };