diff options
author | Roland Dreier <roland@purestorage.com> | 2014-03-04 22:57:51 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-09 01:08:29 -0500 |
commit | aa0689b36b2144e91d2182605bed951565c4899b (patch) | |
tree | 695d359431f5dea57612688786f2ac0d10c40f51 /drivers/base | |
parent | 88391d49abb7d8dee91d405f96bd9e003cb6798d (diff) |
Revert "driver core: synchronize device shutdown"
This reverts commit 401097ea4b89846d66ac78f7f108d49c2e922d9c. The
original changelog said:
A patch series to make .shutdown execute asynchronously. Some drivers's
shutdown can take a lot of time. The patches can help save some shutdown
time. The patches use Arjan's async API.
This patch:
synchronize all tasks submitted by .shutdown
However, I'm not able to find any evidence that any other patches from
this series were applied, nor am I able to find any async tasks that are
scheduled in a .shutdown context.
On the other hand, we see occasional hangs on shutdown that appear to be
caused by the async_synchronize_full() in device_shutdown() waiting
forever for the async probing in sd if a SCSI disk shows up at just the
wrong time — the system starts the probe, but begins shutting down and
tears down too much of the SCSI driver to finish the probe.
If we had any async shutdown tasks, I guess the right fix would be to
create a "shutdown" async domain and have device_shutdown() only wait
for that domain. But since there apparently are no async shutdown
tasks, we can just revert the waiting.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 80b6a9b22f3e..20da3ad1696b 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/genhd.h> | 23 | #include <linux/genhd.h> |
24 | #include <linux/kallsyms.h> | 24 | #include <linux/kallsyms.h> |
25 | #include <linux/mutex.h> | 25 | #include <linux/mutex.h> |
26 | #include <linux/async.h> | ||
27 | #include <linux/pm_runtime.h> | 26 | #include <linux/pm_runtime.h> |
28 | #include <linux/netdevice.h> | 27 | #include <linux/netdevice.h> |
29 | #include <linux/sysfs.h> | 28 | #include <linux/sysfs.h> |
@@ -1987,7 +1986,6 @@ void device_shutdown(void) | |||
1987 | spin_lock(&devices_kset->list_lock); | 1986 | spin_lock(&devices_kset->list_lock); |
1988 | } | 1987 | } |
1989 | spin_unlock(&devices_kset->list_lock); | 1988 | spin_unlock(&devices_kset->list_lock); |
1990 | async_synchronize_full(); | ||
1991 | } | 1989 | } |
1992 | 1990 | ||
1993 | /* | 1991 | /* |