---

yaml --- r: 300236 b: refs/heads/master c: 226bb7d h: refs/heads/master v: v3
git-mirror · May 7, 2012 · 75190f9 · 75190f9
1 parent c22306a
commit 75190f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a84477c4acebf6299b6a8bd6a1d5894eb838ffa
+refs/heads/master: 226bb7df3d22bcf4a1c0fe8206c80cc427498eae
diff --git a/trunk/fs/jffs2/gc.c b/trunk/fs/jffs2/gc.c
@@ -234,8 +234,8 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)
 			return 0;
 
 		jffs2_dbg(1, "No progress from erasing block; doing GC anyway\n");
-		spin_lock(&c->erase_completion_lock);
 		mutex_lock(&c->alloc_sem);
+		spin_lock(&c->erase_completion_lock);
 	}
 
 	/* First, work out which block we're garbage-collecting */