[JFFS2] JFFS2 fixes

JFFS2 fixes.

Signed-off-by: Todd Poynor <tpoynor@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c
index cd6a8bd13e0b514d5ad2df1654be9aac93cc9931..8b6c02ae20357e0f5a78783f8801b6d3e6d5ba81 100644 (file)
--- a/fs/jffs2/nodelist.c
+++ b/fs/jffs2/nodelist.c
@@ -127,7 +127,7 @@ int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
 
        valid_ref = jffs2_first_valid_node(f->inocache->nodes);
 
-       if (!valid_ref)
+       if (!valid_ref && (f->inocache->ino != 1))
                printk(KERN_WARNING "Eep. No valid nodes for ino #%u\n", f->inocache->ino);
 
        while (valid_ref) {

diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index c8128069ecf0a8baff6020ce830a9bff87eb0102..8d9019e1c4d6329c9e1457866922f3272ceaf696 100644 (file)
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -532,6 +532,9 @@ int jffs2_flush_wbuf_gc(struct jffs2_sb_info *c, uint32_t ino)
 
        D1(printk(KERN_DEBUG "jffs2_flush_wbuf_gc() called for ino #%u...\n", ino));
 
+       if (!c->wbuf)
+               return 0;
+
        down(&c->alloc_sem);
        if (!jffs2_wbuf_pending_for_ino(c, ino)) {
                D1(printk(KERN_DEBUG "Ino #%d not pending in wbuf. Returning\n", ino));
@@ -578,6 +581,9 @@ int jffs2_flush_wbuf_pad(struct jffs2_sb_info *c)
 {
        int ret;
 
+       if (!c->wbuf)
+               return 0;
+
        down_write(&c->wbuf_sem);
        ret = __jffs2_flush_wbuf(c, PAD_NOACCOUNT);
        up_write(&c->wbuf_sem);