mtd/fs/jffs2 background.c,1.47,1.48

[David Woodhouse]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv11727

Modified Files:
	background.c 
Log Message:
Don't jump between contexts

Index: background.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/background.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- background.c	26 Nov 2003 15:30:58 -0000	1.47
+++ background.c	23 Feb 2004 17:17:23 -0000	1.48
@@ -123,11 +123,7 @@
 
 			case SIGKILL:
 				D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread(): SIGKILL received.\n"));
-			die:
-				spin_lock(&c->erase_completion_lock);
-				c->gc_task = NULL;
-				spin_unlock(&c->erase_completion_lock);
-				complete_and_exit(&c->gc_thread_exit, 0);
+				goto die;
 
 			case SIGHUP:
 				D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread(): SIGHUP received.\n"));
@@ -145,4 +141,9 @@
 			goto die;
 		}
 	}
+ die:
+	spin_lock(&c->erase_completion_lock);
+	c->gc_task = NULL;
+	spin_unlock(&c->erase_completion_lock);
+	complete_and_exit(&c->gc_thread_exit, 0);
 }