Skip to content

Commit

Permalink
sysace: HDIO_GETGEO has it's own method for ages
Browse files Browse the repository at this point in the history
The way this driver tries to implement HDIO_GETGEO it'll never be called.
Then again on ppc it probably will never be called anyway because it's
utterly pointless.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed Aug 11, 2007
1 parent 2e4934a commit a6b3a93
Showing 1 changed file with 10 additions and 19 deletions.
29 changes: 10 additions & 19 deletions drivers/block/xsysace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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,
};

/* --------------------------------------------------------------------
Expand Down

0 comments on commit a6b3a93

Please sign in to comment.