mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 09:13:55 +08:00
ide: IDE_AFLAG_FORMAT_IN_PROGRESS -> IDE_DFLAG_FORMAT_IN_PROGRESS
There should be no functional changes caused by this patch. Acked-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
da167876bd
commit
e01286282e
@ -664,7 +664,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
|
||||
floppy->openers++;
|
||||
|
||||
if (floppy->openers == 1) {
|
||||
drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
|
||||
drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
|
||||
/* Just in case */
|
||||
|
||||
if (ide_do_test_unit_ready(drive, disk))
|
||||
@ -692,7 +692,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
|
||||
ide_set_media_lock(drive, disk, 1);
|
||||
drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;
|
||||
check_disk_change(inode->i_bdev);
|
||||
} else if (drive->atapi_flags & IDE_AFLAG_FORMAT_IN_PROGRESS) {
|
||||
} else if (drive->dev_flags & IDE_DFLAG_FORMAT_IN_PROGRESS) {
|
||||
ret = -EBUSY;
|
||||
goto out_put_floppy;
|
||||
}
|
||||
@ -714,7 +714,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
|
||||
|
||||
if (floppy->openers == 1) {
|
||||
ide_set_media_lock(drive, disk, 0);
|
||||
drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
|
||||
drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
|
||||
}
|
||||
|
||||
floppy->openers--;
|
||||
|
@ -138,11 +138,11 @@ static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)
|
||||
|
||||
if (floppy->openers > 1) {
|
||||
/* Don't format if someone is using the disk */
|
||||
drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
|
||||
drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
drive->atapi_flags |= IDE_AFLAG_FORMAT_IN_PROGRESS;
|
||||
drive->dev_flags |= IDE_DFLAG_FORMAT_IN_PROGRESS;
|
||||
|
||||
/*
|
||||
* Send ATAPI_FORMAT_UNIT to the drive.
|
||||
@ -174,7 +174,7 @@ static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)
|
||||
|
||||
out:
|
||||
if (err)
|
||||
drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
|
||||
drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -497,8 +497,6 @@ enum {
|
||||
IDE_AFLAG_LE_SPEED_FIELDS = (1 << 17),
|
||||
|
||||
/* ide-floppy */
|
||||
/* Format in progress */
|
||||
IDE_AFLAG_FORMAT_IN_PROGRESS = (1 << 18),
|
||||
/* Avoid commands not supported in Clik drive */
|
||||
IDE_AFLAG_CLIK_DRIVE = (1 << 19),
|
||||
/* Requires BH algorithm for packets */
|
||||
@ -579,6 +577,7 @@ enum {
|
||||
IDE_DFLAG_MEDIA_CHANGED = (1 << 29),
|
||||
/* write protect */
|
||||
IDE_DFLAG_WP = (1 << 30),
|
||||
IDE_DFLAG_FORMAT_IN_PROGRESS = (1 << 31),
|
||||
};
|
||||
|
||||
struct ide_drive_s {
|
||||
|
Loading…
Reference in New Issue
Block a user