Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

[~andy/linux] / fs / jffs2 / gc.c

diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c
index ad271c70aa252feac98c4b6f25391ad27a66920b..5a2dec2b064c945aba23acac93dcee2820019d68 100644 (file)
--- a/fs/jffs2/gc.c
+++ b/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 */