Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[safe/jmp/linux-2.6] / drivers / ide / ide-floppy_ioctl.c

diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index 409e4c1..cd8a420 100644 (file)
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -31,13 +31,14 @@
  * On exit we set nformats to the number of records we've actually initialized.
  */
 
-static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
+static int ide_floppy_get_format_capacities(ide_drive_t *drive,
+                                           struct ide_atapi_pc *pc,
+                                           int __user *arg)
 {
        struct ide_disk_obj *floppy = drive->driver_data;
-       struct ide_atapi_pc pc;
-       u8 header_len, desc_cnt;
        int i, blocks, length, u_array_size, u_index;
        int __user *argp;
+       u8 pc_buf[256], header_len, desc_cnt;
 
        if (get_user(u_array_size, arg))
                return -EFAULT;
@@ -45,13 +46,16 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
        if (u_array_size <= 0)
                return -EINVAL;
 
-       ide_floppy_create_read_capacity_cmd(&pc);
-       if (ide_queue_pc_tail(drive, floppy->disk, &pc)) {
+       ide_floppy_create_read_capacity_cmd(pc);
+       pc->buf = &pc_buf[0];
+       pc->buf_size = sizeof(pc_buf);
+
+       if (ide_queue_pc_tail(drive, floppy->disk, pc)) {
                printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");
                return -EIO;
        }
 
-       header_len = pc.buf[3];
+       header_len = pc->buf[3];
        desc_cnt = header_len / 8; /* capacity descriptor of 8 bytes */
 
        u_index = 0;
@@ -68,8 +72,8 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
                if (u_index >= u_array_size)
                        break;  /* User-supplied buffer too small */
 
-               blocks = be32_to_cpup((__be32 *)&pc.buf[desc_start]);
-               length = be16_to_cpup((__be16 *)&pc.buf[desc_start + 6]);
+               blocks = be32_to_cpup((__be32 *)&pc->buf[desc_start]);
+               length = be16_to_cpup((__be16 *)&pc->buf[desc_start + 6]);
 
                if (put_user(blocks, argp))
                        return -EFAULT;
@@ -111,29 +115,28 @@ static void ide_floppy_create_format_unit_cmd(struct ide_atapi_pc *pc, int b,
        pc->flags |= PC_FLAG_WRITING;
 }
 
-static int ide_floppy_get_sfrp_bit(ide_drive_t *drive)
+static int ide_floppy_get_sfrp_bit(ide_drive_t *drive, struct ide_atapi_pc *pc)
 {
        struct ide_disk_obj *floppy = drive->driver_data;
-       struct ide_atapi_pc pc;
 
        drive->atapi_flags &= ~IDE_AFLAG_SRFP;
 
-       ide_floppy_create_mode_sense_cmd(&pc, IDEFLOPPY_CAPABILITIES_PAGE);
-       pc.flags |= PC_FLAG_SUPPRESS_ERROR;
+       ide_floppy_create_mode_sense_cmd(pc, IDEFLOPPY_CAPABILITIES_PAGE);
+       pc->flags |= PC_FLAG_SUPPRESS_ERROR;
 
-       if (ide_queue_pc_tail(drive, floppy->disk, &pc))
+       if (ide_queue_pc_tail(drive, floppy->disk, pc))
                return 1;
 
-       if (pc.buf[8 + 2] & 0x40)
+       if (pc->buf[8 + 2] & 0x40)
                drive->atapi_flags |= IDE_AFLAG_SRFP;
 
        return 0;
 }
 
-static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)
+static int ide_floppy_format_unit(ide_drive_t *drive, struct ide_atapi_pc *pc,
+                                 int __user *arg)
 {
        struct ide_disk_obj *floppy = drive->driver_data;
-       struct ide_atapi_pc pc;
        int blocks, length, flags, err = 0;
 
        if (floppy->openers > 1) {
@@ -166,10 +169,10 @@ static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)
                goto out;
        }
 
-       (void)ide_floppy_get_sfrp_bit(drive);
-       ide_floppy_create_format_unit_cmd(&pc, blocks, length, flags);
+       ide_floppy_get_sfrp_bit(drive, pc);
+       ide_floppy_create_format_unit_cmd(pc, blocks, length, flags);
 
-       if (ide_queue_pc_tail(drive, floppy->disk, &pc))
+       if (ide_queue_pc_tail(drive, floppy->disk, pc))
                err = -EIO;
 
 out:
@@ -188,15 +191,16 @@ out:
  * the dsc bit, and return either 0 or 65536.
  */
 
-static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg)
+static int ide_floppy_get_format_progress(ide_drive_t *drive,
+                                         struct ide_atapi_pc *pc,
+                                         int __user *arg)
 {
        struct ide_disk_obj *floppy = drive->driver_data;
-       struct ide_atapi_pc pc;
        int progress_indication = 0x10000;
 
        if (drive->atapi_flags & IDE_AFLAG_SRFP) {
-               ide_create_request_sense_cmd(drive, &pc);
-               if (ide_queue_pc_tail(drive, floppy->disk, &pc))
+               ide_create_request_sense_cmd(drive, pc);
+               if (ide_queue_pc_tail(drive, floppy->disk, pc))
                        return -EIO;
 
                if (floppy->sense_key == 2 &&
@@ -241,29 +245,29 @@ static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,
        return 0;
 }
 
-static int ide_floppy_format_ioctl(ide_drive_t *drive, struct file *file,
-                                  unsigned int cmd, void __user *argp)
+static int ide_floppy_format_ioctl(ide_drive_t *drive, struct ide_atapi_pc *pc,
+                                  fmode_t mode, unsigned int cmd,
+                                  void __user *argp)
 {
        switch (cmd) {
        case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED:
                return 0;
        case IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY:
-               return ide_floppy_get_format_capacities(drive, argp);
+               return ide_floppy_get_format_capacities(drive, pc, argp);
        case IDEFLOPPY_IOCTL_FORMAT_START:
-               if (!(file->f_mode & 2))
+               if (!(mode & FMODE_WRITE))
                        return -EPERM;
-               return ide_floppy_format_unit(drive, (int __user *)argp);
+               return ide_floppy_format_unit(drive, pc, (int __user *)argp);
        case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:
-               return ide_floppy_get_format_progress(drive, argp);
+               return ide_floppy_get_format_progress(drive, pc, argp);
        default:
                return -ENOTTY;
        }
 }
 
-int ide_floppy_ioctl(ide_drive_t *drive, struct inode *inode,
-                    struct file *file, unsigned int cmd, unsigned long arg)
+int ide_floppy_ioctl(ide_drive_t *drive, struct block_device *bdev,
+                    fmode_t mode, unsigned int cmd, unsigned long arg)
 {
-       struct block_device *bdev = inode->i_bdev;
        struct ide_atapi_pc pc;
        void __user *argp = (void __user *)arg;
        int err;
@@ -271,7 +275,7 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct inode *inode,
        if (cmd == CDROMEJECT || cmd == CDROM_LOCKDOOR)
                return ide_floppy_lockdoor(drive, &pc, arg, cmd);
 
-       err = ide_floppy_format_ioctl(drive, file, cmd, argp);
+       err = ide_floppy_format_ioctl(drive, &pc, mode, cmd, argp);
        if (err != -ENOTTY)
                return err;
 
@@ -280,11 +284,11 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct inode *inode,
         * and CDROM_SEND_PACKET (legacy) ioctls
         */
        if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
-               err = scsi_cmd_ioctl(file, bdev->bd_disk->queue,
-                                       bdev->bd_disk, cmd, argp);
+               err = scsi_cmd_ioctl(bdev->bd_disk->queue, bdev->bd_disk,
+                               mode, cmd, argp);
 
        if (err == -ENOTTY)
-               err = generic_ide_ioctl(drive, file, bdev, cmd, arg);
+               err = generic_ide_ioctl(drive, bdev, cmd, arg);
 
        return err;
 }