Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  BLOCK: Hide the contents of linux/bio.h if CONFIG_BLOCK=n
  sysace: HDIO_GETGEO has it's own method for ages
  drivers/block/cpqarray.c: better error handling and kmalloc + memset conversion to k[cz]alloc
  drivers/block/cciss.c: kmalloc + memset conversion to kzalloc
  Clean up duplicate includes in drivers/block/
  Fix remap handling by blktrace
  [PATCH] remove mm/filemap.c:file_send_actor()

1 files changed, 10 insertions, 19 deletions

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index cb27e8863d7c..3ede0b63da13 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -902,26 +902,17 @@ static int ace_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
-static int ace_ioctl(struct inode *inode, struct file *filp,
-                     unsigned int cmd, unsigned long arg)
+static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 {
-        struct ace_device *ace = inode->i_bdev->bd_disk->private_data;
-        struct hd_geometry __user *geo = (struct hd_geometry __user *)arg;
-        struct hd_geometry g;
-        dev_dbg(ace->dev, "ace_ioctl()\n");
-
-        switch (cmd) {
-        case HDIO_GETGEO:
-                g.heads = ace->cf_id.heads;
-                g.sectors = ace->cf_id.sectors;
-                g.cylinders = ace->cf_id.cyls;
-                g.start = 0;
-                return copy_to_user(geo, &g, sizeof(g)) ? -EFAULT : 0;
+        struct ace_device *ace = bdev->bd_disk->private_data;
 
-        default:
-                return -ENOTTY;
-        }
-        return -ENOTTY;
+        dev_dbg(ace->dev, "ace_getgeo()\n");
+
+        geo->heads = ace->cf_id.heads;
+        geo->sectors = ace->cf_id.sectors;
+        geo->cylinders = ace->cf_id.cyls;
+
+        return 0;
 }
 
 static struct block_device_operations ace_fops = {
@@ -930,7 +921,7 @@ static struct block_device_operations ace_fops = {
         .release = ace_release,
         .media_changed = ace_media_changed,
         .revalidate_disk = ace_revalidate_disk,
-        .ioctl = ace_ioctl,
+        .getgeo = ace_getgeo,
 };
 
 /* --------------------------------------------------------------------