adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[JFFS2] Remove support for virtual blocks

Browse source 
Remove support for virtual blocks, which are build by
concatenation of multiple physical erase blocks.

For more information please read the MTD mailing list thread
"[PATCH] remove support for virtual blocks"

Signed-off-by: Ferenc Havasi <havasi@inf.u-szeged.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ferenc Havasi 2005-08-31 14:51:04 +01:00 committed by Thomas Gleixner
parent f0507530cb
commit 4ce1f56218
4 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/jffs2/build.c
View file

@ -7,7 +7,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
* $Id: build.c,v 1.76 2005/07/30 15:29:27 lunn Exp $
* $Id: build.c,v 1.77 2005/08/31 13:51:00 havasi Exp $
*
*/
@ -318,7 +318,7 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c)
c->free_size = c->flash_size;
c->nr_blocks = c->flash_size / c->sector_size;
#ifndef __ECOS
if (c->mtd->flags & MTD_NO_VIRTBLOCKS)
if (jffs2_blocks_use_vmalloc(c))
c->blocks = vmalloc(sizeof(struct jffs2_eraseblock) * c->nr_blocks);
else
#endif
@ -356,7 +356,7 @@ int jffs2_do_mount_fs(struct jffs2_sb_info *c)
jffs2_free_ino_caches(c);
jffs2_free_raw_node_refs(c);
#ifndef __ECOS
if (c->mtd->flags & MTD_NO_VIRTBLOCKS)
if (jffs2_blocks_use_vmalloc(c))
vfree(c->blocks);
else
#endif

19
fs/jffs2/fs.c
View file

@ -7,7 +7,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
* $Id: fs.c,v 1.62 2005/08/06 04:51:30 nico Exp $
* $Id: fs.c,v 1.64 2005/09/01 08:42:31 havasi Exp $
*
*/
@ -457,19 +457,8 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
#endif
c->flash_size = c->mtd->size;
/*
* Check, if we have to concatenate physical blocks to larger virtual blocks
* to reduce the memorysize for c->blocks. (kmalloc allows max. 128K allocation)
*/
c->sector_size = c->mtd->erasesize;
blocks = c->flash_size / c->sector_size;
if (!(c->mtd->flags & MTD_NO_VIRTBLOCKS)) {
while ((blocks * sizeof (struct jffs2_eraseblock)) > (128 * 1024)) {
blocks >>= 1;
c->sector_size <<= 1;
}
}
/*
* Size alignment check
@ -480,10 +469,6 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
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;
@ -533,7 +518,7 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
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);

7
fs/jffs2/nodelist.h
View file

@ -7,7 +7,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
* $Id: nodelist.h,v 1.138 2005/08/17 13:46:23 dedekind Exp $
* $Id: nodelist.h,v 1.139 2005/08/31 13:51:00 havasi Exp $
*
*/
@ -197,6 +197,11 @@ struct jffs2_eraseblock
struct jffs2_raw_node_ref *gc_node; /* Next node to be garbage collected */
};
static inline int jffs2_blocks_use_vmalloc(struct jffs2_sb_info *c)
{
return ((c->flash_size / c->sector_size) * sizeof (struct jffs2_eraseblock)) > (128 * 1024);
}
/* Calculate totlen from surrounding nodes or eraseblock */
static inline uint32_t __ref_totlen(struct jffs2_sb_info *c,
struct jffs2_eraseblock *jeb,

4
fs/jffs2/super.c
View file

@ -7,7 +7,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
* $Id: super.c,v 1.107 2005/07/12 16:37:08 dedekind Exp $
* $Id: super.c,v 1.108 2005/08/31 13:51:00 havasi Exp $
*
*/
@ -284,7 +284,7 @@ static void jffs2_put_super (struct super_block *sb)
up(&c->alloc_sem);
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);