diff options
-rw-r--r-- | fs/jffs2/fs.c | 3 | ||||
-rw-r--r-- | fs/jffs2/readinode.c | 3 | ||||
-rw-r--r-- | fs/jffs2/scan.c | 3 | ||||
-rw-r--r-- | fs/jffs2/summary.c | 4 |
4 files changed, 4 insertions, 9 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 7bc1a4201c0c..abb90c0c09cc 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c | |||
@@ -502,12 +502,11 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent) | |||
502 | if (ret) | 502 | if (ret) |
503 | return ret; | 503 | return ret; |
504 | 504 | ||
505 | c->inocache_list = kmalloc(INOCACHE_HASHSIZE * sizeof(struct jffs2_inode_cache *), GFP_KERNEL); | 505 | c->inocache_list = kcalloc(INOCACHE_HASHSIZE, sizeof(struct jffs2_inode_cache *), GFP_KERNEL); |
506 | if (!c->inocache_list) { | 506 | if (!c->inocache_list) { |
507 | ret = -ENOMEM; | 507 | ret = -ENOMEM; |
508 | goto out_wbuf; | 508 | goto out_wbuf; |
509 | } | 509 | } |
510 | memset(c->inocache_list, 0, INOCACHE_HASHSIZE * sizeof(struct jffs2_inode_cache *)); | ||
511 | 510 | ||
512 | jffs2_init_xattr_subsystem(c); | 511 | jffs2_init_xattr_subsystem(c); |
513 | 512 | ||
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c index 266423b2709d..58a0b912e9d0 100644 --- a/fs/jffs2/readinode.c +++ b/fs/jffs2/readinode.c | |||
@@ -944,13 +944,12 @@ int jffs2_do_read_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, | |||
944 | int jffs2_do_crccheck_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic) | 944 | int jffs2_do_crccheck_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic) |
945 | { | 945 | { |
946 | struct jffs2_raw_inode n; | 946 | struct jffs2_raw_inode n; |
947 | struct jffs2_inode_info *f = kmalloc(sizeof(*f), GFP_KERNEL); | 947 | struct jffs2_inode_info *f = kzalloc(sizeof(*f), GFP_KERNEL); |
948 | int ret; | 948 | int ret; |
949 | 949 | ||
950 | if (!f) | 950 | if (!f) |
951 | return -ENOMEM; | 951 | return -ENOMEM; |
952 | 952 | ||
953 | memset(f, 0, sizeof(*f)); | ||
954 | init_MUTEX_LOCKED(&f->sem); | 953 | init_MUTEX_LOCKED(&f->sem); |
955 | f->inocache = ic; | 954 | f->inocache = ic; |
956 | 955 | ||
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index e2413466ddd5..ee4fc50b0b20 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c | |||
@@ -128,12 +128,11 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) | |||
128 | } | 128 | } |
129 | 129 | ||
130 | if (jffs2_sum_active()) { | 130 | if (jffs2_sum_active()) { |
131 | s = kmalloc(sizeof(struct jffs2_summary), GFP_KERNEL); | 131 | s = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL); |
132 | if (!s) { | 132 | if (!s) { |
133 | JFFS2_WARNING("Can't allocate memory for summary\n"); | 133 | JFFS2_WARNING("Can't allocate memory for summary\n"); |
134 | return -ENOMEM; | 134 | return -ENOMEM; |
135 | } | 135 | } |
136 | memset(s, 0, sizeof(struct jffs2_summary)); | ||
137 | } | 136 | } |
138 | 137 | ||
139 | for (i=0; i<c->nr_blocks; i++) { | 138 | for (i=0; i<c->nr_blocks; i++) { |
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c index e52cef526d90..c4f7e4703c0a 100644 --- a/fs/jffs2/summary.c +++ b/fs/jffs2/summary.c | |||
@@ -26,15 +26,13 @@ | |||
26 | 26 | ||
27 | int jffs2_sum_init(struct jffs2_sb_info *c) | 27 | int jffs2_sum_init(struct jffs2_sb_info *c) |
28 | { | 28 | { |
29 | c->summary = kmalloc(sizeof(struct jffs2_summary), GFP_KERNEL); | 29 | c->summary = kzalloc(sizeof(struct jffs2_summary), GFP_KERNEL); |
30 | 30 | ||
31 | if (!c->summary) { | 31 | if (!c->summary) { |
32 | JFFS2_WARNING("Can't allocate memory for summary information!\n"); | 32 | JFFS2_WARNING("Can't allocate memory for summary information!\n"); |
33 | return -ENOMEM; | 33 | return -ENOMEM; |
34 | } | 34 | } |
35 | 35 | ||
36 | memset(c->summary, 0, sizeof(struct jffs2_summary)); | ||
37 | |||
38 | c->summary->sum_buf = vmalloc(c->sector_size); | 36 | c->summary->sum_buf = vmalloc(c->sector_size); |
39 | 37 | ||
40 | if (!c->summary->sum_buf) { | 38 | if (!c->summary->sum_buf) { |