ide-disk: use IDE_DFLAG_MEDIA_CHANGED

Set IDE_DFLAG_MEDIA_CHANGED in ide_gd_open() to signalize
ide_gd_media_changed() that that media has changed (instead
of relying on IDE_DFLAG_REMOVABLE).

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>

diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 84bbcfee9233b26d39cd19255e30341d246b35af..c08500270b9ddd925a712f8337cf59eee8f151bd 100644 (file)
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -160,6 +160,7 @@ static int ide_gd_open(struct inode *inode, struct file *filp)
                 * and the door_lock is irrelevant at this point.
                 */
                ide_disk_set_doorlock(drive, 1);
+               drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;
                check_disk_change(inode->i_bdev);
        }
        return 0;
@@ -199,6 +200,7 @@ static int ide_gd_media_changed(struct gendisk *disk)
 {
        struct ide_disk_obj *idkp = ide_drv_g(disk, ide_disk_obj);
        ide_drive_t *drive = idkp->drive;
+       int ret;
 
        /* do not scan partitions twice if this is a removable device */
        if (drive->dev_flags & IDE_DFLAG_ATTACH) {
@@ -206,8 +208,10 @@ static int ide_gd_media_changed(struct gendisk *disk)
                return 0;
        }
 
-       /* if removable, always assume it was changed */
-       return !!(drive->dev_flags & IDE_DFLAG_REMOVABLE);
+       ret = !!(drive->dev_flags & IDE_DFLAG_MEDIA_CHANGED);
+       drive->dev_flags &= ~IDE_DFLAG_MEDIA_CHANGED;
+
+       return ret;
 }
 
 static int ide_gd_revalidate_disk(struct gendisk *disk)