mtd/fs/jffs2 nodemgmt.c,1.98,1.99

[David Woodhouse]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv12560

Modified Files:
	nodemgmt.c 
Log Message:
No longer assume that flushing the wbuf won't change nextblock. If there's 
an error and recovery, it can.


Index: nodemgmt.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodemgmt.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- nodemgmt.c	3 Oct 2003 15:54:50 -0000	1.98
+++ nodemgmt.c	4 Oct 2003 00:50:36 -0000	1.99
@@ -163,7 +163,8 @@
 			D1(printk(KERN_DEBUG "jffs2_do_reserve_space: Flushing write buffer\n"));			    
 			jffs2_flush_wbuf_pad(c);
 			spin_lock(&c->erase_completion_lock);
-			/* We know nobody's going to have changed nextblock. Just continue */
+			jeb = c->nextblock;
+			goto restart;
 		}
 		c->wasted_size += jeb->free_size;
 		c->free_size -= jeb->free_size;