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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
jffs
/
jffs_fm.c
diff --git
a/fs/jffs/jffs_fm.c
b/fs/jffs/jffs_fm.c
index
6da13b3
..
5a95fbd
100644
(file)
--- a/
fs/jffs/jffs_fm.c
+++ b/
fs/jffs/jffs_fm.c
@@
-17,6
+17,7
@@
*
*/
#include <linux/slab.h>
*
*/
#include <linux/slab.h>
+#include <linux/err.h>
#include <linux/blkdev.h>
#include <linux/jffs.h>
#include "jffs_fm.h"
#include <linux/blkdev.h>
#include <linux/jffs.h>
#include "jffs_fm.h"
@@
-29,8
+30,8
@@
static int jffs_mark_obsolete(struct jffs_fmcontrol *fmc, __u32 fm_offset);
static struct jffs_fm *jffs_alloc_fm(void);
static void jffs_free_fm(struct jffs_fm *n);
static struct jffs_fm *jffs_alloc_fm(void);
static void jffs_free_fm(struct jffs_fm *n);
-extern
kmem_cache_t
*fm_cache;
-extern
kmem_cache_t
*node_cache;
+extern
struct kmem_cache
*fm_cache;
+extern
struct kmem_cache
*node_cache;
#if CONFIG_JFFS_FS_VERBOSE > 0
void
#if CONFIG_JFFS_FS_VERBOSE > 0
void
@@
-94,8
+95,7
@@
jffs_build_begin(struct jffs_control *c, int unit)
struct mtd_info *mtd;
D3(printk("jffs_build_begin()\n"));
struct mtd_info *mtd;
D3(printk("jffs_build_begin()\n"));
- fmc = (struct jffs_fmcontrol *)kmalloc(sizeof(struct jffs_fmcontrol),
- GFP_KERNEL);
+ fmc = kmalloc(sizeof(*fmc), GFP_KERNEL);
if (!fmc) {
D(printk("jffs_build_begin(): Allocation of "
"struct jffs_fmcontrol failed!\n"));
if (!fmc) {
D(printk("jffs_build_begin(): Allocation of "
"struct jffs_fmcontrol failed!\n"));
@@
-105,7
+105,7
@@
jffs_build_begin(struct jffs_control *c, int unit)
mtd = get_mtd_device(NULL, unit);
mtd = get_mtd_device(NULL, unit);
- if (
!mtd
) {
+ if (
IS_ERR(mtd)
) {
kfree(fmc);
DJM(no_jffs_fmcontrol--);
return NULL;
kfree(fmc);
DJM(no_jffs_fmcontrol--);
return NULL;
@@
-139,7
+139,7
@@
jffs_build_begin(struct jffs_control *c, int unit)
fmc->tail = NULL;
fmc->head_extra = NULL;
fmc->tail_extra = NULL;
fmc->tail = NULL;
fmc->head_extra = NULL;
fmc->tail_extra = NULL;
-
init_MUTEX
(&fmc->biglock);
+
mutex_init
(&fmc->biglock);
return fmc;
}
return fmc;
}
@@
-486,8
+486,7
@@
jffs_add_node(struct jffs_node *node)
D3(printk("jffs_add_node(): ino = %u\n", node->ino));
D3(printk("jffs_add_node(): ino = %u\n", node->ino));
- ref = (struct jffs_node_ref *)kmalloc(sizeof(struct jffs_node_ref),
- GFP_KERNEL);
+ ref = kmalloc(sizeof(*ref), GFP_KERNEL);
if (!ref)
return -ENOMEM;
if (!ref)
return -ENOMEM;