+ freezer-fix-jffs2-garbage-collector-freezing-issue.patch added to -mm tree

[akpm@xxxxxxxxxxxxxxxxxxxx]

The patch titled
     Freezer: fix JFFS2 garbage collector freezing issue
has been added to the -mm tree.  Its filename is
     freezer-fix-jffs2-garbage-collector-freezing-issue.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: Freezer: fix JFFS2 garbage collector freezing issue
From: Rafael J. Wysocki <rjw@xxxxxxx>

Fix breakage caused by commit d5d8c5976d6adeddb8208c240460411e2198b393
"freezer: do not send signals to kernel threads" in
jffs2_garbage_collect_thread() that assumed it would be sent signals by the
freezer.

Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Pete MacKay <armlinux@xxxxxxxxxxxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/jffs2/background.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff -puN fs/jffs2/background.c~freezer-fix-jffs2-garbage-collector-freezing-issue fs/jffs2/background.c
--- a/fs/jffs2/background.c~freezer-fix-jffs2-garbage-collector-freezing-issue
+++ a/fs/jffs2/background.c
@@ -103,15 +103,17 @@ static int jffs2_garbage_collect_thread(
 		   get there first. */
 		yield();
 
+		/* If system suspend is in progress, go to the refrigerator and
+		   start again when the suspend is done */
+		if (try_to_freeze())
+			goto again;
+
 		/* Put_super will send a SIGKILL and then wait on the sem.
 		 */
 		while (signal_pending(current)) {
 			siginfo_t info;
 			unsigned long signr;
 
-			if (try_to_freeze())
-				goto again;
-
 			signr = dequeue_signal_lock(current, &current->blocked, &info);
 
 			switch(signr) {
_

Patches currently in -mm which might be from rjw@xxxxxxx are

origin.patch
git-acpi.patch
gregkh-driver-kset-convert-to-kobj_sysfs_ops-vs-git-acpi.patch
freezer-fix-jffs2-garbage-collector-freezing-issue.patch
fix-proc-net-breakage.patch
hwmon-coretemp-suspend-fix.patch
hwmon-coretemp-suspend-fix-fix.patch
page-allocator-clean-up-pcp-draining-functions.patch
kernel-power-diskc-make-code-static.patch
make-kernel_shutdown_prepare-static.patch
proc-fix-the-threaded-proc-self.patch
shrink_slab-handle-bad-shrinkers.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html