ide-floppy: factor out ioctl handlers from idefloppy_ioctl()
By passing idefloppy_floppy_t *floppy to the factored out functions, we get rid of (almost) all local vars so stack usage should be at minimum here. Also, we merge idefloppy_begin_format() into idefloppy_format_start() since it is its only user. Also, rename idefloppy_format_start() to idefloppy_format_unit(). Finally, rename the reworked functions to ide_floppy..(). Bart - minor CodingStyle fixup Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
194ec0c078
commit
20bf7bdad4
1 changed files with 78 additions and 75 deletions
|
@ -1289,44 +1289,6 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
** Send ATAPI_FORMAT_UNIT to the drive.
|
|
||||||
**
|
|
||||||
** Userland gives us the following structure:
|
|
||||||
**
|
|
||||||
** struct idefloppy_format_command {
|
|
||||||
** int nblocks;
|
|
||||||
** int blocksize;
|
|
||||||
** int flags;
|
|
||||||
** } ;
|
|
||||||
**
|
|
||||||
** flags is a bitmask, currently, the only defined flag is:
|
|
||||||
**
|
|
||||||
** 0x01 - verify media after format.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int idefloppy_begin_format(ide_drive_t *drive, int __user *arg)
|
|
||||||
{
|
|
||||||
int blocks;
|
|
||||||
int length;
|
|
||||||
int flags;
|
|
||||||
idefloppy_pc_t pc;
|
|
||||||
|
|
||||||
if (get_user(blocks, arg) ||
|
|
||||||
get_user(length, arg+1) ||
|
|
||||||
get_user(flags, arg+2)) {
|
|
||||||
return (-EFAULT);
|
|
||||||
}
|
|
||||||
|
|
||||||
(void) idefloppy_get_sfrp_bit(drive);
|
|
||||||
idefloppy_create_format_unit_cmd(&pc, blocks, length, flags);
|
|
||||||
if (idefloppy_queue_pc_tail(drive, &pc)) {
|
|
||||||
return (-EIO);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Get ATAPI_FORMAT_UNIT progress indication.
|
** Get ATAPI_FORMAT_UNIT progress indication.
|
||||||
**
|
**
|
||||||
|
@ -1678,64 +1640,105 @@ static int idefloppy_getgeo(struct block_device *bdev, struct hd_geometry *geo)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int ide_floppy_lockdoor(idefloppy_floppy_t *floppy, idefloppy_pc_t *pc,
|
||||||
|
unsigned long arg, unsigned int cmd)
|
||||||
|
{
|
||||||
|
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)) {
|
||||||
|
int prevent = arg ? 1 : 0;
|
||||||
|
|
||||||
|
if (cmd == CDROMEJECT)
|
||||||
|
prevent = 0;
|
||||||
|
|
||||||
|
idefloppy_create_prevent_cmd(pc, prevent);
|
||||||
|
(void) idefloppy_queue_pc_tail(floppy->drive, pc);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cmd == CDROMEJECT) {
|
||||||
|
idefloppy_create_start_stop_cmd(pc, 2);
|
||||||
|
(void) idefloppy_queue_pc_tail(floppy->drive, pc);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int ide_floppy_format_unit(idefloppy_floppy_t *floppy,
|
||||||
|
int __user *arg)
|
||||||
|
{
|
||||||
|
int blocks, length, flags, err = 0;
|
||||||
|
idefloppy_pc_t pc;
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Send ATAPI_FORMAT_UNIT to the drive.
|
||||||
|
*
|
||||||
|
* Userland gives us the following structure:
|
||||||
|
*
|
||||||
|
* struct idefloppy_format_command {
|
||||||
|
* int nblocks;
|
||||||
|
* int blocksize;
|
||||||
|
* int flags;
|
||||||
|
* } ;
|
||||||
|
*
|
||||||
|
* flags is a bitmask, currently, the only defined flag is:
|
||||||
|
*
|
||||||
|
* 0x01 - verify media after format.
|
||||||
|
*/
|
||||||
|
if (get_user(blocks, arg) ||
|
||||||
|
get_user(length, arg+1) ||
|
||||||
|
get_user(flags, arg+2)) {
|
||||||
|
err = -EFAULT;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
(void) idefloppy_get_sfrp_bit(floppy->drive);
|
||||||
|
idefloppy_create_format_unit_cmd(&pc, blocks, length, flags);
|
||||||
|
|
||||||
|
if (idefloppy_queue_pc_tail(floppy->drive, &pc))
|
||||||
|
err = -EIO;
|
||||||
|
|
||||||
|
out:
|
||||||
|
if (err)
|
||||||
|
clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static int idefloppy_ioctl(struct inode *inode, struct file *file,
|
static int idefloppy_ioctl(struct inode *inode, struct file *file,
|
||||||
unsigned int cmd, unsigned long arg)
|
unsigned int cmd, unsigned long arg)
|
||||||
{
|
{
|
||||||
struct block_device *bdev = inode->i_bdev;
|
struct block_device *bdev = inode->i_bdev;
|
||||||
struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk);
|
struct ide_floppy_obj *floppy = ide_floppy_g(bdev->bd_disk);
|
||||||
ide_drive_t *drive = floppy->drive;
|
ide_drive_t *drive = floppy->drive;
|
||||||
|
idefloppy_pc_t pc;
|
||||||
void __user *argp = (void __user *)arg;
|
void __user *argp = (void __user *)arg;
|
||||||
int err;
|
int err;
|
||||||
int prevent = (arg) ? 1 : 0;
|
|
||||||
idefloppy_pc_t pc;
|
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case CDROMEJECT:
|
case CDROMEJECT:
|
||||||
prevent = 0;
|
|
||||||
/* fall through */
|
/* fall through */
|
||||||
case CDROM_LOCKDOOR:
|
case CDROM_LOCKDOOR:
|
||||||
if (floppy->openers > 1)
|
return ide_floppy_lockdoor(floppy, &pc, arg, cmd);
|
||||||
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 IDEFLOPPY_IOCTL_FORMAT_SUPPORTED:
|
case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED:
|
||||||
return 0;
|
return 0;
|
||||||
case IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY:
|
case IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY:
|
||||||
return ide_floppy_get_format_capacities(drive, argp);
|
return ide_floppy_get_format_capacities(drive, argp);
|
||||||
case IDEFLOPPY_IOCTL_FORMAT_START:
|
case IDEFLOPPY_IOCTL_FORMAT_START:
|
||||||
|
|
||||||
if (!(file->f_mode & 2))
|
if (!(file->f_mode & 2))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
|
||||||
if (floppy->openers > 1) {
|
return ide_floppy_format_unit(floppy, (int __user *)arg);
|
||||||
/* 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);
|
|
||||||
if (err)
|
|
||||||
clear_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags);
|
|
||||||
return err;
|
|
||||||
/*
|
|
||||||
** Note, the bit will be cleared when the device is
|
|
||||||
** closed. This is the cleanest way to handle the
|
|
||||||
** situation where the drive does not support
|
|
||||||
** format progress reporting.
|
|
||||||
*/
|
|
||||||
case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:
|
case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:
|
||||||
return idefloppy_get_format_progress(drive, argp);
|
return idefloppy_get_format_progress(drive, argp);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue