summaryrefslogtreecommitdiff
path: root/linux/src/drivers
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2006-10-08 13:43:51 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:26:42 +0200
commit143ee06bfad83cdf9395da4c975668086e41cf4a (patch)
treeec8a1c1e3c61792e91676b320d673901d706baff /linux/src/drivers
parentb07c6b082f978e1e9944f63670467d8ed0d9ea76 (diff)
2006-10-08 Thomas Schwinge <tschwinge@gnu.org>
* linux/dev/drivers/scsi/sd_ioctl.c: Move file... * linux/src/drivers/scsi/sd_ioctl.c: ... here.
Diffstat (limited to 'linux/src/drivers')
-rw-r--r--linux/src/drivers/scsi/sd_ioctl.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/linux/src/drivers/scsi/sd_ioctl.c b/linux/src/drivers/scsi/sd_ioctl.c
index 52fd754..4c58f04 100644
--- a/linux/src/drivers/scsi/sd_ioctl.c
+++ b/linux/src/drivers/scsi/sd_ioctl.c
@@ -31,9 +31,11 @@ int sd_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigne
switch (cmd) {
case HDIO_GETGEO: /* Return BIOS disk parameters */
if (!loc) return -EINVAL;
+#ifndef MACH
error = verify_area(VERIFY_WRITE, loc, sizeof(*loc));
if (error)
return error;
+#endif
host = rscsi_disks[MINOR(dev) >> 4].device->host;
/* default to most commonly used values */
@@ -51,10 +53,17 @@ int sd_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigne
else scsicam_bios_param(&rscsi_disks[MINOR(dev) >> 4],
dev, &diskinfo[0]);
+#ifdef MACH
+ loc->heads = diskinfo[0];
+ loc->sectors = diskinfo[1];
+ loc->cylinders = diskinfo[2];
+ loc->start = sd[MINOR(inode->i_rdev)].start_sect;
+#else
put_user(diskinfo[0], &loc->heads);
put_user(diskinfo[1], &loc->sectors);
put_user(diskinfo[2], &loc->cylinders);
put_user(sd[MINOR(inode->i_rdev)].start_sect, &loc->start);
+#endif
return 0;
case BLKGETSIZE: /* Return device size */
if (!arg) return -EINVAL;