2 files changed, 12 insertions, 8 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));
 
diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index f9dcac1415ac..456adf020f22 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: nodemgmt.c,v 1.118 2005/02/27 23:01:32 dwmw2 Exp $
+ * $Id: nodemgmt.c,v 1.119 2005/02/28 08:21:05 dedekind Exp $
  *
  */
 
@@ -403,7 +403,7 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
         jeb = &c->blocks[blocknr];
 
         if (jffs2_can_mark_obsolete(c) && !jffs2_is_readonly(c) &&
-            !(c->flags & JFFS2_SB_FLAG_MOUNTING)) {
+            !(c->flags & (JFFS2_SB_FLAG_SCANNING | JFFS2_SB_FLAG_BUILDING))) {
                 /* Hm. This may confuse static lock analysis. If any of the above 
                    three conditions is false, we're going to return from this 
                    function without actually obliterating any nodes or freeing
@@ -470,8 +470,8 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
 
         D1(ACCT_PARANOIA_CHECK(jeb));
 
-        if (c->flags & JFFS2_SB_FLAG_MOUNTING) {
-                /* Mount in progress. Don't muck about with the block
+        if (c->flags & JFFS2_SB_FLAG_SCANNING) {
+                /* Flash scanning is in progress. Don't muck about with the block
                    lists because they're not ready yet, and don't actually
                    obliterate nodes that look obsolete. If they weren't 
                    marked obsolete on the flash at the time they _became_
@@ -530,7 +530,8 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
 
         spin_unlock(&c->erase_completion_lock);
 
-        if (!jffs2_can_mark_obsolete(c) || jffs2_is_readonly(c)) {
+        if (!jffs2_can_mark_obsolete(c) || jffs2_is_readonly(c) ||
+                (c->flags & JFFS2_SB_FLAG_BUILDING)) {
                 /* We didn't lock the erase_free_sem */
                 return;
         }