From 75190f93405575e190c9af681438b4380edd825d Mon Sep 17 00:00:00 2001
From: Josh Cartwright <joshc@linux.com>
Date: Thu, 29 Mar 2012 19:34:53 -0400
Subject: [PATCH] --- yaml --- r: 300236 b: refs/heads/master c:
 226bb7df3d22bcf4a1c0fe8206c80cc427498eae h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/jffs2/gc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fded61eab263..f1896ebea475 100644
--- 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
index ad271c70aa25..5a2dec2b064c 100644
--- 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 */