git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove SLAB_CTOR_CONSTRUCTOR
[safe/jmp/linux-2.6]
/
fs
/
jffs2
/
super.c
diff --git
a/fs/jffs2/super.c
b/fs/jffs2/super.c
index
7deb782
..
6488af4
100644
(file)
--- a/
fs/jffs2/super.c
+++ b/
fs/jffs2/super.c
@@
-1,14
+1,12
@@
/*
* JFFS2 -- Journalling Flash File System, Version 2.
*
/*
* JFFS2 -- Journalling Flash File System, Version 2.
*
- * Copyright
(C) 2001-2003
Red Hat, Inc.
+ * Copyright
© 2001-2007
Red Hat, Inc.
*
* Created by David Woodhouse <dwmw2@infradead.org>
*
* For licensing information, see the file 'LICENCE' in this directory.
*
*
* Created by David Woodhouse <dwmw2@infradead.org>
*
* For licensing information, see the file 'LICENCE' in this directory.
*
- * $Id: super.c,v 1.110 2005/11/07 11:14:42 gleixner Exp $
- *
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
@@
-17,6
+15,7
@@
#include <linux/init.h>
#include <linux/list.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/fs.h>
+#include <linux/err.h>
#include <linux/mount.h>
#include <linux/jffs2.h>
#include <linux/pagemap.h>
#include <linux/mount.h>
#include <linux/jffs2.h>
#include <linux/pagemap.h>
@@
-48,11
+47,8
@@
static void jffs2_i_init_once(void * foo, struct kmem_cache * cachep, unsigned l
{
struct jffs2_inode_info *ei = (struct jffs2_inode_info *) foo;
{
struct jffs2_inode_info *ei = (struct jffs2_inode_info *) foo;
- if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
- SLAB_CTOR_CONSTRUCTOR) {
- init_MUTEX(&ei->sem);
- inode_init_once(&ei->vfs_inode);
- }
+ init_MUTEX(&ei->sem);
+ inode_init_once(&ei->vfs_inode);
}
static int jffs2_sync_fs(struct super_block *sb, int wait)
}
static int jffs2_sync_fs(struct super_block *sb, int wait)
@@
-65,7
+61,7
@@
static int jffs2_sync_fs(struct super_block *sb, int wait)
return 0;
}
return 0;
}
-static struct super_operations jffs2_super_operations =
+static
const
struct super_operations jffs2_super_operations =
{
.alloc_inode = jffs2_alloc_inode,
.destroy_inode =jffs2_destroy_inode,
{
.alloc_inode = jffs2_alloc_inode,
.destroy_inode =jffs2_destroy_inode,
@@
-184,9
+180,9
@@
static int jffs2_get_sb_mtdnr(struct file_system_type *fs_type,
struct mtd_info *mtd;
mtd = get_mtd_device(NULL, mtdnr);
struct mtd_info *mtd;
mtd = get_mtd_device(NULL, mtdnr);
- if (
!mtd
) {
+ if (
IS_ERR(mtd)
) {
D1(printk(KERN_DEBUG "jffs2: MTD device #%u doesn't appear to exist\n", mtdnr));
D1(printk(KERN_DEBUG "jffs2: MTD device #%u doesn't appear to exist\n", mtdnr));
- return
-EINVAL
;
+ return
PTR_ERR(mtd)
;
}
return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt);
}
return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt);
@@
-221,7
+217,7
@@
static int jffs2_get_sb(struct file_system_type *fs_type,
D1(printk(KERN_DEBUG "jffs2_get_sb(): mtd:%%s, name \"%s\"\n", dev_name+4));
for (mtdnr = 0; mtdnr < MAX_MTD_DEVICES; mtdnr++) {
mtd = get_mtd_device(NULL, mtdnr);
D1(printk(KERN_DEBUG "jffs2_get_sb(): mtd:%%s, name \"%s\"\n", dev_name+4));
for (mtdnr = 0; mtdnr < MAX_MTD_DEVICES; mtdnr++) {
mtd = get_mtd_device(NULL, mtdnr);
- if (
mtd
) {
+ if (
!IS_ERR(mtd)
) {
if (!strcmp(mtd->name, dev_name+4))
return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt);
put_mtd_device(mtd);
if (!strcmp(mtd->name, dev_name+4))
return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt);
put_mtd_device(mtd);
@@
-346,7
+342,7
@@
static int __init init_jffs2_fs(void)
#ifdef CONFIG_JFFS2_SUMMARY
" (SUMMARY) "
#endif
#ifdef CONFIG_JFFS2_SUMMARY
" (SUMMARY) "
#endif
- "
(C)
2001-2006 Red Hat, Inc.\n");
+ "
©
2001-2006 Red Hat, Inc.\n");
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),