mtd/fs/jffs3 nodemgmt.c, 3.11, 3.12 scan.h, 1.4, 1.5 summary.c, 3.3, 3.4 super.c, 3.7, 3.8

[havasi at infradead.org]

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

Modified Files:
	nodemgmt.c scan.h summary.c super.c 
Log Message:

Summary fixes (related to Artem's changes)



Index: nodemgmt.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/nodemgmt.c,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -r3.11 -r3.12
--- nodemgmt.c	3 Jan 2005 19:13:14 -0000	3.11
+++ nodemgmt.c	5 Jan 2005 08:33:46 -0000	3.12
@@ -18,6 +18,8 @@
 #include <linux/compiler.h>
 #include <linux/sched.h> /* For cond_resched() */
 #include "nodelist.h"
+#include "scan.h"
+#include "summary.h"
 
 /**
  *	jffs3_reserve_space - request physical space to write nodes to flash

Index: scan.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/scan.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scan.h	3 Jan 2005 18:45:01 -0000	1.4
+++ scan.h	5 Jan 2005 08:33:46 -0000	1.5
@@ -26,6 +26,10 @@
 		c->free_size -= _x; c->used_size += _x; \
 		jeb->free_size -= _x ; jeb->used_size += _x; \
 		}while(0)
+#define WASTED_SPACE(x) do { typeof(x) _x = (x); \
+		c->free_size -= _x; c->wasted_size += _x; \
+		jeb->free_size -= _x ; jeb->wasted_size += _x; \
+		}while(0)
 #define UNCHECKED_SPACE(x) do { typeof(x) _x = (x); \
 		c->free_size -= _x; c->unchecked_size += _x; \
 		jeb->free_size -= _x ; jeb->unchecked_size += _x; \

Index: summary.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/summary.c,v
retrieving revision 3.3
retrieving revision 3.4
diff -u -r3.3 -r3.4
--- summary.c	25 Dec 2004 11:11:22 -0000	3.3
+++ summary.c	5 Jan 2005 08:33:46 -0000	3.4
@@ -21,6 +21,8 @@
 #include <linux/compiler.h>
 #include <linux/vmalloc.h>
 #include "nodelist.h"
+#include "scan.h"
+#include "summary.h"
 
 int jffs3_sum_init(struct jffs3_sb_info *c)
 {

Index: super.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/super.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -r3.7 -r3.8
--- super.c	3 Jan 2005 18:45:02 -0000	3.7
+++ super.c	5 Jan 2005 08:33:46 -0000	3.8
@@ -27,6 +27,7 @@
 #include "jffs3.h"
 #include "compr.h"
 #include "nodelist.h"
+#include "summary.h"
 
 static void jffs3_put_super(struct super_block *);