Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cedd120c authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 5fef0e5c

drivers/ide/ide-gd.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -160,6 +160,7 @@ static int ide_gd_open(struct inode *inode, struct file *filp) 
		 * and the door_lock is irrelevant at this point.

		 * and the door_lock is irrelevant at this point.

		 */

		 */

		ide_disk_set_doorlock(drive, 1);

		ide_disk_set_doorlock(drive, 1);

		drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;

		check_disk_change(inode->i_bdev);

		check_disk_change(inode->i_bdev);

	}

	}

	return 0;

	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);

	struct ide_disk_obj *idkp = ide_drv_g(disk, ide_disk_obj);

	ide_drive_t *drive = idkp->drive;

	ide_drive_t *drive = idkp->drive;

	int ret;





	/* do not scan partitions twice if this is a removable device */

	/* do not scan partitions twice if this is a removable device */

	if (drive->dev_flags & IDE_DFLAG_ATTACH) {

	if (drive->dev_flags & IDE_DFLAG_ATTACH) {
@@ -206,8 +208,10 @@ static int ide_gd_media_changed(struct gendisk *disk) 
		return 0;

		return 0;

	}

	}





	/* if removable, always assume it was changed */

	ret = !!(drive->dev_flags & IDE_DFLAG_MEDIA_CHANGED);

	return !!(drive->dev_flags & IDE_DFLAG_REMOVABLE);

	drive->dev_flags &= ~IDE_DFLAG_MEDIA_CHANGED;



	return ret;

}

}





static int ide_gd_revalidate_disk(struct gendisk *disk)

static int ide_gd_revalidate_disk(struct gendisk *disk)