looks good, some minor issues noted below
On Thursday 03 January 2008, Borislav Petkov wrote:
> There should be no functional change resulting from this patch.
>
> Signed-off-by: Borislav Petkov <bbpetkov@xxxxxxxx>
> ---
> drivers/ide/ide-floppy.c | 90 +++++++++++++++++++++++++++++-----------------
> 1 files changed, 57 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
> index 196a697..7823447 100644
> --- a/drivers/ide/ide-floppy.c
> +++ b/drivers/ide/ide-floppy.c
> @@ -1600,6 +1600,58 @@ static int idefloppy_getgeo(struct block_device *bdev, struct hd_geometry *geo)
> return 0;
> }
>
> +static int idefloppy_lockdoor(struct inode *inode, idefloppy_pc_t *pc,
> + int event, unsigned int cmd)
> +{
> + struct block_device *bdev = inode->i_bdev;
if 'drive' is passed as an argument, 'inode' and 'bdev' can be removed
('floppy' can be obtained from drive->driver_data)
> + struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk);
> + ide_drive_t *drive = floppy->drive;
> +
> + if (floppy->openers > 1)
> + return -EBUSY;
> +
> + /* The IOMEGA Clik! Drive doesn't support this command -
> + * no room for an eject mechanism */
> + if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) {
> + idefloppy_create_prevent_cmd(pc, event);
> + (void) idefloppy_queue_pc_tail(drive, pc);
> + }
> +
> + if (cmd == CDROMEJECT) {
> + idefloppy_create_start_stop_cmd(pc, 2);
> + (void) idefloppy_queue_pc_tail(drive, pc);
> + }
> +
> + return 0;
> +}
> +
> +static
> +int idefloppy_format_start(struct file *file, struct inode *inode,
> + void __user *argp)
> +{
> + struct block_device *bdev = inode->i_bdev;
> + struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk);
> + ide_drive_t *drive = floppy->drive;
> + int err;
> +
> + if (!(file->f_mode & 2))
> + return -EPERM;
if this check is left in idefloppy_ioctl() it is enough to pass 'drive'
and 'argp' to idefloppy_format_start()
> + if (floppy->openers > 1) {
> + /* Don't format if someone is using the disk */
> + clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags);
> + return -EBUSY;
> + }
> +
> + set_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags);
> +
> + err = idefloppy_begin_format(drive, argp);
idefloppy_begin_format() is called only by idefloppy_format_start() so it
would make sense to just merge the latter function into the former one
> + if (err)
> + clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags);
> +
> + return err;
> +}
> +
> static int idefloppy_ioctl(struct inode *inode, struct file *file,
> unsigned int cmd, unsigned long arg)
> {
> @@ -1612,47 +1664,19 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file,
> idefloppy_pc_t pc;
>
> switch (cmd) {
> +
stray newline, no need for it
> case CDROMEJECT:
> prevent = 0;
by adding:
if (cmd == CDROMEJECT)
prevent = 0;
to idefloppy_lockdoor() it is possible to remove the above line
(together with 'prevent' variable)
> /* fall through */
> - case CDROM_LOCKDOOR:
> - if (floppy->openers > 1)
> - return -EBUSY;
>
> - /* The IOMEGA Clik! Drive doesn't support this command -
> - * no room for an eject mechanism */
> - if (!test_bit(IDEFLOPPY_CLIK_DRIVE, &floppy->flags)) {
> - idefloppy_create_prevent_cmd(&pc, prevent);
> - (void) idefloppy_queue_pc_tail(drive, &pc);
> - }
> - if (cmd == CDROMEJECT) {
> - idefloppy_create_start_stop_cmd(&pc, 2);
> - (void) idefloppy_queue_pc_tail(drive, &pc);
> - }
> - return 0;
> + case CDROM_LOCKDOOR:
> + return idefloppy_lockdoor(inode, &pc, prevent, cmd);
[...]
> @@ -1669,7 +1693,7 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file,
> */
> if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
> err = scsi_cmd_ioctl(file, bdev->bd_disk->queue,
> - bdev->bd_disk, cmd, argp);
> + bdev->bd_disk, cmd, argp);
> else
> err = -ENOTTY;
>
this chunk doesn't seem to be needed
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
