mtd/fs/jffs2 scan.c,1.93,1.94

gleixner at infradead.org gleixner at infradead.org
Mon Nov 25 15:11:44 EST 2002


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

Modified Files:
	scan.c 
Log Message:
fix oops, in scan_eraseblock

Index: scan.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/scan.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- scan.c	21 Oct 2002 13:42:29 -0000	1.93
+++ scan.c	25 Nov 2002 20:11:40 -0000	1.94
@@ -596,8 +596,8 @@
 		jeb->wasted_size = 0;
 	}
 
-	if ((jeb->used_size + jeb->unchecked_size) == PAD(c->cleanmarker_size) && 
-	    !jeb->first_node->next_in_ino && !jeb->dirty_size)
+	if ((jeb->used_size + jeb->unchecked_size) == PAD(c->cleanmarker_size) && (
+	    !jeb->first_node || (jeb->first_node->next_in_ino && !jeb->dirty_size)))
 		return BLK_STATE_CLEANMARKER;
 	/* move blocks with max 4 byte dirty space to cleanlist */	
 	else if (!ISDIRTY(c->sector_size - (jeb->used_size + jeb->unchecked_size))) {





More information about the linux-mtd-cvs mailing list