mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 09:36:22 +02:00
ata fixes for 7.2-rc3
- Fix handling of security locked drive revalidation. This prevents
such drives from being dropped when locked on resume (Terrence).
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQSRPv8tYSvhwAzJdzjdoc3SxdoYdgUCalCc1gAKCRDdoc3SxdoY
dn5AAQDFOituq8siLG4lUjsTmZ0yOzzZO3dzLFmDASXDmdPJ1AEAqsW4AYOt0FHO
1ePotSlMoRQ8/Q3sHg8SDkjC2iw6QAQ=
=2Hqi
-----END PGP SIGNATURE-----
Merge tag 'ata-7.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
Pull ata fixes from Damien Le Moal:
- Fix handling of security locked drive revalidation. This prevents
such drives from being dropped when locked on resume (Terrence)
* tag 'ata-7.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
ata: libata-core: Allow capacity transition to zero for locked drives
ata: libata-core: Skip HPA resize for locked drives
This commit is contained in:
commit
8f964d992e
|
|
@ -1338,7 +1338,7 @@ static int ata_hpa_resize(struct ata_device *dev)
|
|||
/* do we need to do it? */
|
||||
if ((dev->class != ATA_DEV_ATA && dev->class != ATA_DEV_ZAC) ||
|
||||
!ata_id_has_lba(dev->id) || !ata_id_hpa_enabled(dev->id) ||
|
||||
(dev->quirks & ATA_QUIRK_BROKEN_HPA))
|
||||
(dev->quirks & ATA_QUIRK_BROKEN_HPA) || ata_id_is_locked(dev->id))
|
||||
return 0;
|
||||
|
||||
/* read native max address */
|
||||
|
|
@ -3992,7 +3992,7 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,
|
|||
|
||||
/* verify n_sectors hasn't changed */
|
||||
if (dev->class != ATA_DEV_ATA || !n_sectors ||
|
||||
dev->n_sectors == n_sectors)
|
||||
dev->n_sectors == n_sectors || ata_id_is_locked(dev->id))
|
||||
return 0;
|
||||
|
||||
/* n_sectors has changed */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user