diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-18 19:48:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-18 19:48:39 +0300 |
| commit | ecbcffe3b7edc9a42b4e29ed8dafd56855ee675c (patch) | |
| tree | 186259f22b23814e0f4653a7c99f83a0b30c30a6 /include | |
| parent | 1dbbfe254d2360993e79a10ca42aeec407e13b34 (diff) | |
| parent | 6aa0365a3c8512587fffd42fe438768709ddef8e (diff) | |
| download | linux-ecbcffe3b7edc9a42b4e29ed8dafd56855ee675c.tar.xz | |
Merge tag 'ata-6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata
Pull ata fix from Damien Le Moal:
- Avoid deadlocks on resume from sleep by delaying scsi rescan until
the scsi device is also fully resumed.
* tag 'ata-6.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
ata: libata-scsi: Avoid deadlock on rescan after device resume
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 311cd93377c7..dd5797fb6305 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -836,7 +836,7 @@ struct ata_port { struct mutex scsi_scan_mutex; struct delayed_work hotplug_task; - struct work_struct scsi_rescan_task; + struct delayed_work scsi_rescan_task; unsigned int hsm_task_state; |