lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: IDE_AFLAG_WP -> IDE_DFLAG_WP

Browse Source 
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:
Bartlomiej Zolnierkiewicz
2008-10-17 18:09:11 +02:00
parent fe11edfaab
commit da167876bd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ide/ide-floppy.c
View File

@@ -410,11 +410,11 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
} }
if (pc.buf[3] & 0x80) if (pc.buf[3] & 0x80)
drive->atapi_flags |= IDE_AFLAG_WP; drive->dev_flags |= IDE_DFLAG_WP;
else else
drive->atapi_flags &= ~IDE_AFLAG_WP; drive->dev_flags &= ~IDE_DFLAG_WP;
set_disk_ro(disk, !!(drive->atapi_flags & IDE_AFLAG_WP)); set_disk_ro(disk, !!(drive->dev_flags & IDE_DFLAG_WP));
page = &pc.buf[8]; page = &pc.buf[8];
@@ -684,7 +684,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
goto out_put_floppy; goto out_put_floppy;
} }
if ((drive->atapi_flags & IDE_AFLAG_WP) && (filp->f_mode & 2)) { if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & 2)) {
ret = -EROFS; ret = -EROFS;
goto out_put_floppy; goto out_put_floppy;
} }

4
include/linux/ide.h
View File

@@ -503,8 +503,6 @@ enum {
IDE_AFLAG_CLIK_DRIVE = (1 << 19), IDE_AFLAG_CLIK_DRIVE = (1 << 19),
/* Requires BH algorithm for packets */ /* Requires BH algorithm for packets */
IDE_AFLAG_ZIP_DRIVE = (1 << 20), IDE_AFLAG_ZIP_DRIVE = (1 << 20),
/* Write protect */
IDE_AFLAG_WP = (1 << 21),
/* Supports format progress report */ /* Supports format progress report */
IDE_AFLAG_SRFP = (1 << 22), IDE_AFLAG_SRFP = (1 << 22),
@@ -579,6 +577,8 @@ enum {
/* heads unloaded, please don't reset port */ /* heads unloaded, please don't reset port */
IDE_DFLAG_PARKED = (1 << 28), IDE_DFLAG_PARKED = (1 << 28),
IDE_DFLAG_MEDIA_CHANGED = (1 << 29), IDE_DFLAG_MEDIA_CHANGED = (1 << 29),
/* write protect */
IDE_DFLAG_WP = (1 << 30),
}; };
struct ide_drive_s { struct ide_drive_s {