diff options
| author |   Mika Westerberg <mika.westerberg@linux.intel.com> | 2019-10-04 13:00:25 +0300 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-10-06 09:11:37 -0600 |
| commit | 0e48f51cbbfbdb79149806de14dcb8bf0f01ca94 (patch) | |
| tree | 61ddfe90317118824b15ae7cff539cb8f8232b62 /drivers/ata | |
| parent | bdi: Do not use freezable workqueue (diff) | |
| download | linux-dev-0e48f51cbbfbdb79149806de14dcb8bf0f01ca94.tar.xz linux-dev-0e48f51cbbfbdb79149806de14dcb8bf0f01ca94.zip | |
Revert "libata, freezer: avoid block device removal while system is frozen"
This reverts commit 85fbd722ad0f5d64d1ad15888cd1eb2188bfb557.
The commit was added as a quick band-aid for a hang that happened when a
block device was removed during system suspend. Now that bdi_wq is not
freezable anymore the hang should not be possible and we can get rid of
this hack by reverting it.
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 76d0f9de767b..58e09ffe8b9c 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -4791,27 +4791,6 @@ void ata_scsi_hotplug(struct work_struct *work) return; } - /* - * XXX - UGLY HACK - * - * The block layer suspend/resume path is fundamentally broken due - * to freezable kthreads and workqueue and may deadlock if a block - * device gets removed while resume is in progress. I don't know - * what the solution is short of removing freezable kthreads and - * workqueues altogether. - * - * The following is an ugly hack to avoid kicking off device - * removal while freezer is active. This is a joke but does avoid - * this particular deadlock scenario. - * - * https://bugzilla.kernel.org/show_bug.cgi?id=62801 - * http://marc.info/?l=linux-kernel&m=138695698516487 - */ -#ifdef CONFIG_FREEZER - while (pm_freezing) - msleep(10); -#endif - DPRINTK("ENTER\n"); mutex_lock(&ap->scsi_scan_mutex); |