From 143ee06bfad83cdf9395da4c975668086e41cf4a Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sun, 8 Oct 2006 13:43:51 +0000 Subject: 2006-10-08 Thomas Schwinge * linux/dev/drivers/scsi/sd_ioctl.c: Move file... * linux/src/drivers/scsi/sd_ioctl.c: ... here. --- linux/dev/drivers/scsi/sd_ioctl.c | 128 -------------------------------------- linux/src/drivers/scsi/sd_ioctl.c | 9 +++ 2 files changed, 9 insertions(+), 128 deletions(-) delete mode 100644 linux/dev/drivers/scsi/sd_ioctl.c (limited to 'linux') diff --git a/linux/dev/drivers/scsi/sd_ioctl.c b/linux/dev/drivers/scsi/sd_ioctl.c deleted file mode 100644 index 4c58f04..0000000 --- a/linux/dev/drivers/scsi/sd_ioctl.c +++ /dev/null @@ -1,128 +0,0 @@ -/* - * drivers/scsi/sd_ioctl.c - * - * ioctl handling for SCSI disks - */ - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include "scsi.h" -#include -#include "hosts.h" -#include "sd.h" -#include /* must follow "hosts.h" */ - -int sd_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg) -{ - kdev_t dev = inode->i_rdev; - int error; - struct Scsi_Host * host; - int diskinfo[4]; - struct hd_geometry *loc = (struct hd_geometry *) arg; - - 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 */ - - diskinfo[0] = 0x40; - diskinfo[1] = 0x20; - diskinfo[2] = rscsi_disks[MINOR(dev) >> 4].capacity >> 11; - -/* override with calculated, extended default, or driver values */ - - if(host->hostt->bios_param != NULL) - host->hostt->bios_param(&rscsi_disks[MINOR(dev) >> 4], - dev, - &diskinfo[0]); - 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; - error = verify_area(VERIFY_WRITE, (long *) arg, sizeof(long)); - if (error) - return error; - put_user(sd[MINOR(inode->i_rdev)].nr_sects, - (long *) arg); - return 0; - - case BLKRASET: - if (!suser()) - return -EACCES; - if(!(inode->i_rdev)) return -EINVAL; - if(arg > 0xff) return -EINVAL; - read_ahead[MAJOR(inode->i_rdev)] = arg; - return 0; - - case BLKRAGET: - if (!arg) - return -EINVAL; - error = verify_area(VERIFY_WRITE, (int *) arg, sizeof(int)); - if (error) - return error; - put_user(read_ahead[MAJOR(inode->i_rdev)], (int *) arg); - return 0; - - case BLKFLSBUF: - if(!suser()) return -EACCES; - if(!(inode->i_rdev)) return -EINVAL; - fsync_dev(inode->i_rdev); - invalidate_buffers(inode->i_rdev); - return 0; - - case BLKRRPART: /* Re-read partition tables */ - return revalidate_scsidisk(dev, 1); - - RO_IOCTLS(dev, arg); - - default: - return scsi_ioctl(rscsi_disks[MINOR(dev) >> 4].device , cmd, (void *) arg); - } -} - -/* - * Overrides for Emacs so that we follow Linus's tabbing style. - * Emacs will notice this stuff at the end of the file and automatically - * adjust the settings for this buffer only. This must remain at the end - * of the file. - * --------------------------------------------------------------------------- - * Local variables: - * c-indent-level: 4 - * c-brace-imaginary-offset: 0 - * c-brace-offset: -4 - * c-argdecl-indent: 4 - * c-label-offset: -4 - * c-continued-statement-offset: 4 - * c-continued-brace-offset: 0 - * indent-tabs-mode: nil - * tab-width: 8 - * End: - */ 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; -- cgit v1.2.3