diff --git a/[refs] b/[refs]
index c3e153d990e7..03b291e1c4b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bf3ba538a150f8430104a50e88c1449e8fa1fe6
+refs/heads/master: 4b4d1cc7336b29f766d4e59d1ed2c627443a694a
diff --git a/trunk/fs/jffs2/background.c b/trunk/fs/jffs2/background.c
index 7b77a9541125..ff2a872e80e7 100644
--- a/trunk/fs/jffs2/background.c
+++ b/trunk/fs/jffs2/background.c
@@ -35,8 +35,7 @@ int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c)
 	pid_t pid;
 	int ret = 0;
 
-	if (c->gc_task)
-		BUG();
+	BUG_ON(c->gc_task);
 
 	init_completion(&c->gc_thread_start);
 	init_completion(&c->gc_thread_exit);