[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>

2 files changed, 44 insertions, 40 deletions

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index fa49d62626ba..62d2464c12f2 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -747,32 +747,33 @@ static int pd_open(struct inode *inode, struct file *file)
         return 0;
 }
 
+static int pd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
+{
+        struct pd_unit *disk = bdev->bd_disk->private_data;
+
+        if (disk->alt_geom) {
+                geo->heads = PD_LOG_HEADS;
+                geo->sectors = PD_LOG_SECTS;
+                geo->cylinders = disk->capacity / (geo->heads * geo->sectors);
+        } else {
+                geo->heads = disk->heads;
+                geo->sectors = disk->sectors;
+                geo->cylinders = disk->cylinders;
+        }
+
+        return 0;
+}
+
 static int pd_ioctl(struct inode *inode, struct file *file,
          unsigned int cmd, unsigned long arg)
 {
         struct pd_unit *disk = inode->i_bdev->bd_disk->private_data;
-        struct hd_geometry __user *geo = (struct hd_geometry __user *) arg;
-        struct hd_geometry g;
 
         switch (cmd) {
         case CDROMEJECT:
                 if (disk->access == 1)
                         pd_special_command(disk, pd_eject);
                 return 0;
-        case HDIO_GETGEO:
-                if (disk->alt_geom) {
-                        g.heads = PD_LOG_HEADS;
-                        g.sectors = PD_LOG_SECTS;
-                        g.cylinders = disk->capacity / (g.heads * g.sectors);
-                } else {
-                        g.heads = disk->heads;
-                        g.sectors = disk->sectors;
-                        g.cylinders = disk->cylinders;
-                }
-                g.start = get_start_sect(inode->i_bdev);
-                if (copy_to_user(geo, &g, sizeof(struct hd_geometry)))
-                        return -EFAULT;
-                return 0;
         default:
                 return -EINVAL;
         }
@@ -815,6 +816,7 @@ static struct block_device_operations pd_fops = {
         .open           = pd_open,
         .release        = pd_release,
         .ioctl          = pd_ioctl,
+        .getgeo         = pd_getgeo,
         .media_changed  = pd_check_media,
         .revalidate_disk= pd_revalidate
 };
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index e9746af29b9f..852b564e903a 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -205,6 +205,7 @@ static int pf_open(struct inode *inode, struct file *file);
 static void do_pf_request(request_queue_t * q);
 static int pf_ioctl(struct inode *inode, struct file *file,
                     unsigned int cmd, unsigned long arg);
+static int pf_getgeo(struct block_device *bdev, struct hd_geometry *geo);
 
 static int pf_release(struct inode *inode, struct file *file);
 
@@ -266,6 +267,7 @@ static struct block_device_operations pf_fops = {
         .open           = pf_open,
         .release        = pf_release,
         .ioctl          = pf_ioctl,
+        .getgeo         = pf_getgeo,
         .media_changed  = pf_check_media,
 };
 
@@ -313,34 +315,34 @@ static int pf_open(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int pf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static int pf_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 {
-        struct pf_unit *pf = inode->i_bdev->bd_disk->private_data;
-        struct hd_geometry __user *geo = (struct hd_geometry __user *) arg;
-        struct hd_geometry g;
-        sector_t capacity;
-
-        if (cmd == CDROMEJECT) {
-                if (pf->access == 1) {
-                        pf_eject(pf);
-                        return 0;
-                }
-                return -EBUSY;
-        }
-        if (cmd != HDIO_GETGEO)
-                return -EINVAL;
-        capacity = get_capacity(pf->disk);
+        struct pf_unit *pf = bdev->bd_disk->private_data;
+        sector_t capacity = get_capacity(pf->disk);
+
         if (capacity < PF_FD_MAX) {
-                g.cylinders = sector_div(capacity, PF_FD_HDS * PF_FD_SPT);
-                g.heads = PF_FD_HDS;
-                g.sectors = PF_FD_SPT;
+                geo->cylinders = sector_div(capacity, PF_FD_HDS * PF_FD_SPT);
+                geo->heads = PF_FD_HDS;
+                geo->sectors = PF_FD_SPT;
         } else {
-                g.cylinders = sector_div(capacity, PF_HD_HDS * PF_HD_SPT);
-                g.heads = PF_HD_HDS;
-                g.sectors = PF_HD_SPT;
+                geo->cylinders = sector_div(capacity, PF_HD_HDS * PF_HD_SPT);
+                geo->heads = PF_HD_HDS;
+                geo->sectors = PF_HD_SPT;
         }
-        if (copy_to_user(geo, &g, sizeof(g)))
-                return -EFAULT;
+
+        return 0;
+}
+
+static int pf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct pf_unit *pf = inode->i_bdev->bd_disk->private_data;
+
+        if (cmd != CDROMEJECT)
+                return -EINVAL;
+
+        if (pf->access != 1)
+                return -EBUSY;
+        pf_eject(pf);
         return 0;
 }