From 4490c881329dc0a2e206d283d7553ce9fc923673 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 25 May 2006 01:37:28 +0100
Subject: [PATCH] --- yaml --- r: 27876 b: refs/heads/master c:
 f560928baa605e8faaa3de6cc1b11ebb645e97db h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/jffs2/scan.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 321f33b26eb8..70d2cd81a6e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12efdde3139c568a59561b69865fd14f37c75603
+refs/heads/master: f560928baa605e8faaa3de6cc1b11ebb645e97db
diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c
index 3551c39d7472..c25750aa85e3 100644
--- a/trunk/fs/jffs2/scan.c
+++ b/trunk/fs/jffs2/scan.c
@@ -244,11 +244,8 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
 
 		D1(printk(KERN_DEBUG "jffs2_scan_medium(): Skipping %d bytes in nextblock to ensure page alignment\n",
 			  skip));
-		c->nextblock->wasted_size += skip;
-		c->wasted_size += skip;
-
-		c->nextblock->free_size -= skip;
-		c->free_size -= skip;
+		jffs2_prealloc_raw_node_refs(c, 1);
+		jffs2_scan_dirty_space(c, c->nextblock, skip);
 	}
 #endif
 	if (c->nr_erasing_blocks) {