[JFFS2] Follow-on to Ferenc's jffs2-novirtblocks patch [From: Peter Grayson ] diff -Narup mtd/fs/jffs2/fs.c mtd-novirtblock2/fs/jffs2/fs.c --- mtd/fs/jffs2/fs.c 2005-08-31 17:56:25.000000000 -0600 +++ mtd-novirtblock2/fs/jffs2/fs.c 2005-08-31 23:07:31.887566728 -0600 @@ -469,10 +469,6 @@ int jffs2_do_fill_super(struct super_blo c->flash_size / 1024); } - if (c->sector_size != c->mtd->erasesize) - printk(KERN_INFO "jffs2: Erase block size too small (%dKiB). Using virtual blocks size (%dKiB) instead\n", - c->mtd->erasesize / 1024, c->sector_size / 1024); - if (c->flash_size < 5*c->sector_size) { printk(KERN_ERR "jffs2: Too few erase blocks (%d)\n", c->flash_size / c->sector_size); return -EINVAL; @@ -522,7 +518,7 @@ int jffs2_do_fill_super(struct super_blo iput(root_i); jffs2_free_ino_caches(c); jffs2_free_raw_node_refs(c); - if (c->mtd->flags & MTD_NO_VIRTBLOCKS) + if (jffs2_blocks_use_vmalloc(c)) vfree(c->blocks); else kfree(c->blocks);