diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/jfs/jfs_logmgr.c | 9 | ||||
-rw-r--r-- | fs/jfs/jfs_metapage.c | 3 | ||||
-rw-r--r-- | fs/jfs/super.c | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 3113ff53bd55..0b348b13b551 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c | |||
@@ -1105,11 +1105,10 @@ int lmLogOpen(struct super_block *sb) | |||
1105 | } | 1105 | } |
1106 | } | 1106 | } |
1107 | 1107 | ||
1108 | if (!(log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL))) { | 1108 | if (!(log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL))) { |
1109 | up(&jfs_log_sem); | 1109 | up(&jfs_log_sem); |
1110 | return -ENOMEM; | 1110 | return -ENOMEM; |
1111 | } | 1111 | } |
1112 | memset(log, 0, sizeof(struct jfs_log)); | ||
1113 | INIT_LIST_HEAD(&log->sb_list); | 1112 | INIT_LIST_HEAD(&log->sb_list); |
1114 | init_waitqueue_head(&log->syncwait); | 1113 | init_waitqueue_head(&log->syncwait); |
1115 | 1114 | ||
@@ -1181,9 +1180,8 @@ static int open_inline_log(struct super_block *sb) | |||
1181 | struct jfs_log *log; | 1180 | struct jfs_log *log; |
1182 | int rc; | 1181 | int rc; |
1183 | 1182 | ||
1184 | if (!(log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL))) | 1183 | if (!(log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL))) |
1185 | return -ENOMEM; | 1184 | return -ENOMEM; |
1186 | memset(log, 0, sizeof(struct jfs_log)); | ||
1187 | INIT_LIST_HEAD(&log->sb_list); | 1185 | INIT_LIST_HEAD(&log->sb_list); |
1188 | init_waitqueue_head(&log->syncwait); | 1186 | init_waitqueue_head(&log->syncwait); |
1189 | 1187 | ||
@@ -1216,12 +1214,11 @@ static int open_dummy_log(struct super_block *sb) | |||
1216 | 1214 | ||
1217 | down(&jfs_log_sem); | 1215 | down(&jfs_log_sem); |
1218 | if (!dummy_log) { | 1216 | if (!dummy_log) { |
1219 | dummy_log = kmalloc(sizeof(struct jfs_log), GFP_KERNEL); | 1217 | dummy_log = kzalloc(sizeof(struct jfs_log), GFP_KERNEL); |
1220 | if (!dummy_log) { | 1218 | if (!dummy_log) { |
1221 | up(&jfs_log_sem); | 1219 | up(&jfs_log_sem); |
1222 | return -ENOMEM; | 1220 | return -ENOMEM; |
1223 | } | 1221 | } |
1224 | memset(dummy_log, 0, sizeof(struct jfs_log)); | ||
1225 | INIT_LIST_HEAD(&dummy_log->sb_list); | 1222 | INIT_LIST_HEAD(&dummy_log->sb_list); |
1226 | init_waitqueue_head(&dummy_log->syncwait); | 1223 | init_waitqueue_head(&dummy_log->syncwait); |
1227 | dummy_log->no_integrity = 1; | 1224 | dummy_log->no_integrity = 1; |
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index 8a53981f9f27..5fbaeaadccd3 100644 --- a/fs/jfs/jfs_metapage.c +++ b/fs/jfs/jfs_metapage.c | |||
@@ -104,10 +104,9 @@ static inline int insert_metapage(struct page *page, struct metapage *mp) | |||
104 | if (PagePrivate(page)) | 104 | if (PagePrivate(page)) |
105 | a = mp_anchor(page); | 105 | a = mp_anchor(page); |
106 | else { | 106 | else { |
107 | a = kmalloc(sizeof(struct meta_anchor), GFP_NOFS); | 107 | a = kzalloc(sizeof(struct meta_anchor), GFP_NOFS); |
108 | if (!a) | 108 | if (!a) |
109 | return -ENOMEM; | 109 | return -ENOMEM; |
110 | memset(a, 0, sizeof(struct meta_anchor)); | ||
111 | set_page_private(page, (unsigned long)a); | 110 | set_page_private(page, (unsigned long)a); |
112 | SetPagePrivate(page); | 111 | SetPagePrivate(page); |
113 | kmap(page); | 112 | kmap(page); |
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index bd6720d807a6..ab6333347004 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c | |||
@@ -395,10 +395,9 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent) | |||
395 | if (!new_valid_dev(sb->s_bdev->bd_dev)) | 395 | if (!new_valid_dev(sb->s_bdev->bd_dev)) |
396 | return -EOVERFLOW; | 396 | return -EOVERFLOW; |
397 | 397 | ||
398 | sbi = kmalloc(sizeof (struct jfs_sb_info), GFP_KERNEL); | 398 | sbi = kzalloc(sizeof (struct jfs_sb_info), GFP_KERNEL); |
399 | if (!sbi) | 399 | if (!sbi) |
400 | return -ENOSPC; | 400 | return -ENOSPC; |
401 | memset(sbi, 0, sizeof (struct jfs_sb_info)); | ||
402 | sb->s_fs_info = sbi; | 401 | sb->s_fs_info = sbi; |
403 | sbi->sb = sb; | 402 | sbi->sb = sb; |
404 | 403 | ||