Merge branch 'pm-freezer' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into pm-freezer

* 'pm-freezer' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc: (24 commits)
  freezer: fix wait_event_freezable/__thaw_task races
  freezer: kill unused set_freezable_with_signal()
  dmatest: don't use set_freezable_with_signal()
  usb_storage: don't use set_freezable_with_signal()
  freezer: remove unused @sig_only from freeze_task()
  freezer: use lock_task_sighand() in fake_signal_wake_up()
  freezer: restructure __refrigerator()
  freezer: fix set_freezable[_with_signal]() race
  freezer: remove should_send_signal() and update frozen()
  freezer: remove now unused TIF_FREEZE
  freezer: make freezing() test freeze conditions in effect instead of TIF_FREEZE
  cgroup_freezer: prepare for removal of TIF_FREEZE
  freezer: clean up freeze_processes() failure path
  freezer: kill PF_FREEZING
  freezer: test freezable conditions while holding freezer_lock
  freezer: make freezing indicate freeze condition in effect
  freezer: use dedicated lock instead of task_lock() + memory barrier
  freezer: don't distinguish nosig tasks on thaw
  freezer: remove racy clear_freeze_flag() and set PF_NOFREEZE on dead tasks
  freezer: rename thaw_process() to __thaw_task() and simplify the implementation
  ...

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index c325e69415a1..aa84b3d77274 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -831,7 +831,8 @@ static int usb_stor_scan_thread(void * __us)
 
         dev_dbg(dev, "device found\n");
 
-        set_freezable_with_signal();
+        set_freezable();
+
         /*
          * Wait for the timeout to expire or for a disconnect
          *
@@ -839,16 +840,16 @@ static int usb_stor_scan_thread(void * __us)
          * fail to freeze, but we can't be non-freezable either. Nor can
          * khubd freeze while waiting for scanning to complete as it may
          * hold the device lock, causing a hang when suspending devices.
-         * So we request a fake signal when freezing and use
-         * interruptible sleep to kick us out of our wait early when
-         * freezing happens.
+         * So instead of using wait_event_freezable(), explicitly test
+         * for (DONT_SCAN || freezing) in interruptible wait and proceed
+         * if any of DONT_SCAN, freezing or timeout has happened.
          */
         if (delay_use > 0) {
                 dev_dbg(dev, "waiting for device to settle "
                                 "before scanning\n");
                 wait_event_interruptible_timeout(us->delay_wait,
-                                test_bit(US_FLIDX_DONT_SCAN, &us->dflags),
-                                delay_use * HZ);
+                                test_bit(US_FLIDX_DONT_SCAN, &us->dflags) ||
+                                freezing(current), delay_use * HZ);
         }
 
         /* If the device is still connected, perform the scanning */