diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-09-25 10:57:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-09-25 11:01:34 +0200 |
| commit | eb46cb321f1f3f3102f4ad3d61dd5c8c06cdbf17 (patch) | |
| tree | f13d9dd1f85d2d95e841a14d5474f4f2ab761d9c /drivers/base | |
| parent | 56d16d44fe8d8012dabd32700ea143c7caa35ba3 (diff) | |
Revert "driver core: don't always lock parent in shutdown"
This reverts commit ba6353748e71bd1d7e422fec2b5c2e2dfc2e3bd9.
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 <andrej.skvortzov@gmail.com>
Link: https://lore.kernel.org/r/ZvMkkhyJrohaajuk@skv.local
Cc: Christoph Hellwig <hch@lst.de>
Cc: David Jeffery <djeffery@redhat.com>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Laurence Oberman <loberman@redhat.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Stuart Hayes <stuart.w.hayes@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 2bf9730db056..a4c853411a6b 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4816,7 +4816,7 @@ void device_shutdown(void) spin_unlock(&devices_kset->list_lock); /* hold lock to avoid race with probe/release */ - if (parent && dev->bus && dev->bus->need_parent_lock) + if (parent) device_lock(parent); device_lock(dev); @@ -4840,7 +4840,7 @@ void device_shutdown(void) } device_unlock(dev); - if (parent && dev->bus && dev->bus->need_parent_lock) + if (parent) device_unlock(parent); put_device(dev); |