mtd/fs/jffs2 scan.c,1.87,1.88 nodemgmt.c,1.75,1.76

David Woodhouse dwmw2 at infradead.org
Fri Sep 6 10:33:40 EDT 2002


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

Modified Files:
	scan.c nodemgmt.c 
Log Message:
oops, missed a bit

Index: scan.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/scan.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- scan.c	6 Sep 2002 14:12:44 -0000	1.87
+++ scan.c	6 Sep 2002 14:33:37 -0000	1.88
@@ -742,7 +742,7 @@
 	}
 
 	/* Build the data structures and file them for later */
-	raw->flash_offset = ofs;
+	raw->flash_offset = ofs | REF_NORMAL;
 	raw->totlen = PAD(je32_to_cpu(ri->totlen));
 	raw->next_phys = NULL;
 	raw->next_in_ino = ic->nodes;
@@ -776,7 +776,7 @@
 				  jeb->offset, ref_offset(raw)));
 			jffs2_free_full_dnode(fn);
 			jffs2_free_tmp_dnode_info(tn);
-			raw->flash_offset |= 1;
+			raw->flash_offset |= REF_OBSOLETE;
 			DIRTY_SPACE(PAD(je32_to_cpu(ri->totlen)));
 			/* Perhaps we could also mark it as such on the medium. Maybe later */
 			return 0;

Index: nodemgmt.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodemgmt.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- nodemgmt.c	6 Sep 2002 14:12:44 -0000	1.75
+++ nodemgmt.c	6 Sep 2002 14:33:37 -0000	1.76
@@ -294,7 +294,7 @@
 	jeb->free_size -= len;
 	c->free_size -= len;
 	if (dirty) {
-		new->flash_offset |= 1;
+		new->flash_offset |= REF_OBSOLETE;
 		jeb->dirty_size += len;
 		c->dirty_size += len;
 	} else {





More information about the linux-mtd-cvs mailing list