vserver 1.9.5.x5

[linux-2.6.git] / fs / jffs2 / gc.c

diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c
index dc25d81..87ec74f 100644 (file)
--- a/fs/jffs2/gc.c
+++ b/fs/jffs2/gc.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 2001-2003 Red Hat, Inc.
  *
- * Created by David Woodhouse <dwmw2@redhat.com>
+ * Created by David Woodhouse <dwmw2@infradead.org>
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: gc.c,v 1.136 2004/05/27 19:06:09 gleixner Exp $
+ * $Id: gc.c,v 1.144 2004/12/21 11:18:50 dwmw2 Exp $
  *
  */
 
@@ -103,7 +103,7 @@ static struct jffs2_eraseblock *jffs2_find_gc_block(struct jffs2_sb_info *c)
                ret->wasted_size = 0;
        }
 
-       D1(jffs2_dump_block_lists(c));
+       D2(jffs2_dump_block_lists(c));
        return ret;
 }
 
@@ -134,7 +134,7 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)
                if (c->checked_ino > c->highest_ino) {
                        printk(KERN_CRIT "Checked all inodes but still 0x%x bytes of unchecked space?\n",
                               c->unchecked_size);
-                       D1(jffs2_dump_block_lists(c));
+                       D2(jffs2_dump_block_lists(c));
                        spin_unlock(&c->erase_completion_lock);
                        BUG();
                }
@@ -359,10 +359,14 @@ int jffs2_garbage_collect_pass(struct jffs2_sb_info *c)
        spin_unlock(&c->inocache_lock);
 
        f = jffs2_gc_fetch_inode(c, inum, nlink);
-       if (IS_ERR(f))
-               return PTR_ERR(f);
-       if (!f)
-               return 0;
+       if (IS_ERR(f)) {
+               ret = PTR_ERR(f);
+               goto release_sem;
+       }
+       if (!f) {
+               ret = 0;
+               goto release_sem;
+       }
 
        ret = jffs2_garbage_collect_live(c, jeb, raw, f);
 
@@ -598,7 +602,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,
                        printk(KERN_NOTICE "Not marking the space at 0x%08x as dirty because the flash driver returned retlen zero\n", nraw->flash_offset);
                         jffs2_free_raw_node_ref(nraw);
                }
-               if (!retried && (nraw == jffs2_alloc_raw_node_ref())) {
+               if (!retried && (nraw = jffs2_alloc_raw_node_ref())) {
                        /* Try to reallocate space and retry */
                        uint32_t dummy;
                        struct jffs2_eraseblock *jeb = &c->blocks[phys_ofs / c->sector_size];
@@ -624,6 +628,7 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,
                        jffs2_free_raw_node_ref(nraw);
                }
 
+               jffs2_free_raw_node_ref(nraw);
                if (!ret)
                        ret = -EIO;
                goto out_node;
@@ -633,10 +638,12 @@ static int jffs2_garbage_collect_pristine(struct jffs2_sb_info *c,
 
        /* Link into per-inode list. This is safe because of the ic
           state being INO_STATE_GC. Note that if we're doing this
-          for an inode which is in-code, the 'nraw' pointer is then
+          for an inode which is in-core, the 'nraw' pointer is then
           going to be fetched from ic->nodes by our caller. */
+       spin_lock(&c->erase_completion_lock);
         nraw->next_in_ino = ic->nodes;
         ic->nodes = nraw;
+       spin_unlock(&c->erase_completion_lock);
 
        jffs2_mark_node_obsolete(c, raw);
        D1(printk(KERN_DEBUG "WHEEE! GC REF_PRISTINE node at 0x%08x succeeded\n", ref_offset(raw)));