aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem B. Bityuckiy <dedekind@infradead.org>2005-03-20 16:43:26 -0500
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-05-23 07:03:04 -0400
commit3cceb9f6cf433545b607451e5de7af2cd6cec0b5 (patch)
treecc9934231e9977bdd95d2a751bdd36649704af37
parent437316d9b5ea142ca7ab9ef131c28506c407d1d6 (diff)
[JFFS2] Prevent deadlock when flushing write buffer
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--fs/jffs2/gc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c
index 44fa7379098f..694bc90ad779 100644
--- a/fs/jffs2/gc.c
+++ b/fs/jffs2/gc.c
@@ -7,7 +7,7 @@
7 * 7 *
8 * For licensing information, see the file 'LICENCE' in this directory. 8 * For licensing information, see the file 'LICENCE' in this directory.
9 * 9 *
10 * $Id: gc.c,v 1.146 2005/03/20 17:45:25 dedekind Exp $ 10 * $Id: gc.c,v 1.147 2005/03/20 21:43:22 dedekind Exp $
11 * 11 *
12 */ 12 */
13 13
@@ -83,7 +83,9 @@ again:
83 } else if (!list_empty(&c->erasable_pending_wbuf_list)) { 83 } else if (!list_empty(&c->erasable_pending_wbuf_list)) {
84 /* There are blocks are wating for the wbuf sync */ 84 /* There are blocks are wating for the wbuf sync */
85 D1(printk(KERN_DEBUG "Synching wbuf in order to reuse erasable_pending_wbuf_list blocks\n")); 85 D1(printk(KERN_DEBUG "Synching wbuf in order to reuse erasable_pending_wbuf_list blocks\n"));
86 spin_unlock(&c->erase_completion_lock);
86 jffs2_flush_wbuf_pad(c); 87 jffs2_flush_wbuf_pad(c);
88 spin_lock(&c->erase_completion_lock);
87 goto again; 89 goto again;
88 } else { 90 } else {
89 /* Eep. All were empty */ 91 /* Eep. All were empty */