git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
fs
/
jffs2
/
super.c
diff --git
a/fs/jffs2/super.c
b/fs/jffs2/super.c
index
c37fb16
..
257a06e
100644
(file)
--- a/
fs/jffs2/super.c
+++ b/
fs/jffs2/super.c
@@
-7,7
+7,7
@@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
*
* For licensing information, see the file 'LICENCE' in this directory.
*
- * $Id: super.c,v 1.9
7 2004/07/16 15:17
:57 dwmw2 Exp $
+ * $Id: super.c,v 1.9
9 2004/08/24 07:59
:57 dwmw2 Exp $
*
*/
*
*/
@@
-130,7
+130,7
@@
static struct super_block *jffs2_get_sb_mtd(struct file_system_type *fs_type,
mtd->index, mtd->name));
sb->s_op = &jffs2_super_operations;
mtd->index, mtd->name));
sb->s_op = &jffs2_super_operations;
- sb->s_flags
|=
MS_NOATIME;
+ sb->s_flags
= flags |
MS_NOATIME;
ret = jffs2_do_fill_super(sb, data, (flags&MS_VERBOSE)?1:0);
ret = jffs2_do_fill_super(sb, data, (flags&MS_VERBOSE)?1:0);
@@
-302,7
+302,7
@@
static int __init init_jffs2_fs(void)
jffs2_inode_cachep = kmem_cache_create("jffs2_i",
sizeof(struct jffs2_inode_info),
jffs2_inode_cachep = kmem_cache_create("jffs2_i",
sizeof(struct jffs2_inode_info),
- 0, SLAB_
HWCACHE_ALIGN|SLAB_
RECLAIM_ACCOUNT,
+ 0, SLAB_RECLAIM_ACCOUNT,
jffs2_i_init_once, NULL);
if (!jffs2_inode_cachep) {
printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
jffs2_i_init_once, NULL);
if (!jffs2_inode_cachep) {
printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
@@
-330,6
+330,7
@@
static int __init init_jffs2_fs(void)
out_compressors:
jffs2_compressors_exit();
out:
out_compressors:
jffs2_compressors_exit();
out:
+ kmem_cache_destroy(jffs2_inode_cachep);
return ret;
}
return ret;
}