driver core: don't always lock parent in shutdown

Don't lock a parent device unless it is needed in device_shutdown. This
is in preparation for making device shutdown asynchronous, when it will
be needed to allow children of a common parent to shut down
simultaneously.

Signed-off-by: Stuart Hayes <stuart.w.hayes@gmail.com>
Signed-off-by: David Jeffery <djeffery@redhat.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Tested-by: Keith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20240822202805.6379-2-stuart.w.hayes@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 30408a4a4927aa75158075a2729ae07304ff6361..988aff79ee7f52d1ac7bc5ef4041345560f83b7f 100644 (file)
--- 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)
+               if (parent && dev->bus && dev->bus->need_parent_lock)
                        device_lock(parent);
                device_lock(dev);
 
@@ -4840,7 +4840,7 @@ void device_shutdown(void)
                }
 
                device_unlock(dev);
-               if (parent)
+               if (parent && dev->bus && dev->bus->need_parent_lock)
                        device_unlock(parent);
 
                put_device(dev);