[JFFS2] Fix NOR specific scan BUG

Fix fairly sad NOR-specific bug - during FS building ic->scan_dents
isn't zero, but jffs2_mark_node_obsolete() migt be called it tries to
finde the ic corresponding to ref - this requires ic->scan_dents = 0.

Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 6 insertions, 3 deletions

diff --git a/fs/jffs2/build.c b/fs/jffs2/build.c
index a01dd5fdbb95..3dd5394921c9 100644
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: build.c,v 1.69 2004/12/16 20:22:18 dmarlin Exp $
+ * $Id: build.c,v 1.70 2005/02/28 08:21:05 dedekind Exp $
  *
  */
 
@@ -97,14 +97,16 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c)
         /* First, scan the medium and build all the inode caches with
            lists of physical nodes */
 
-        c->flags |= JFFS2_SB_FLAG_MOUNTING;
+        c->flags |= JFFS2_SB_FLAG_SCANNING;
         ret = jffs2_scan_medium(c);
+        c->flags &= ~JFFS2_SB_FLAG_SCANNING;
         if (ret)
                 goto exit;
 
         D1(printk(KERN_DEBUG "Scanned flash completely\n"));
         D2(jffs2_dump_block_lists(c));
 
+        c->flags |= JFFS2_SB_FLAG_BUILDING;
         /* Now scan the directory tree, increasing nlink according to every dirent found. */
         for_each_inode(i, c, ic) {
                 D1(printk(KERN_DEBUG "Pass 1: ino #%u\n", ic->ino));
@@ -116,7 +118,6 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c)
                         cond_resched();
                 }
         }
-        c->flags &= ~JFFS2_SB_FLAG_MOUNTING;
 
         D1(printk(KERN_DEBUG "Pass 1 complete\n"));
 
@@ -164,6 +165,8 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c)
                 ic->scan_dents = NULL;
                 cond_resched();
         }
+        c->flags &= ~JFFS2_SB_FLAG_BUILDING;
+        
         D1(printk(KERN_DEBUG "Pass 3 complete\n"));
         D2(jffs2_dump_block_lists(c));