Skip to content

Commit eb46cb3

Browse files
committed
Revert "driver core: don't always lock parent in shutdown"
This reverts commit ba63537. The series is being reverted before -rc1 as there are still reports of lockups on shutdown, so it's not quite ready for "prime time." Reported-by: Andrey Skvortsov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Cc: Christoph Hellwig <[email protected]> Cc: David Jeffery <[email protected]> Cc: Keith Busch <[email protected]> Cc: Laurence Oberman <[email protected]> Cc: Nathan Chancellor <[email protected]> Cc: Sagi Grimberg <[email protected]> Cc: Stuart Hayes <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 56d16d4 commit eb46cb3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/base/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4816,7 +4816,7 @@ void device_shutdown(void)
48164816
spin_unlock(&devices_kset->list_lock);
48174817

48184818
/* hold lock to avoid race with probe/release */
4819-
if (parent && dev->bus && dev->bus->need_parent_lock)
4819+
if (parent)
48204820
device_lock(parent);
48214821
device_lock(dev);
48224822

@@ -4840,7 +4840,7 @@ void device_shutdown(void)
48404840
}
48414841

48424842
device_unlock(dev);
4843-
if (parent && dev->bus && dev->bus->need_parent_lock)
4843+
if (parent)
48444844
device_unlock(parent);
48454845

48464846
put_device(dev);

0 commit comments

Comments
 (0)