diff options
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r-- | fs/ocfs2/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index a6d2f8cc165b..6e300a88a47e 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -1231,7 +1231,7 @@ static int ocfs2_setup_osb_uuid(struct ocfs2_super *osb, const unsigned char *uu | |||
1231 | 1231 | ||
1232 | BUG_ON(uuid_bytes != OCFS2_VOL_UUID_LEN); | 1232 | BUG_ON(uuid_bytes != OCFS2_VOL_UUID_LEN); |
1233 | 1233 | ||
1234 | osb->uuid_str = kcalloc(1, OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL); | 1234 | osb->uuid_str = kzalloc(OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL); |
1235 | if (osb->uuid_str == NULL) | 1235 | if (osb->uuid_str == NULL) |
1236 | return -ENOMEM; | 1236 | return -ENOMEM; |
1237 | 1237 | ||
@@ -1262,7 +1262,7 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
1262 | 1262 | ||
1263 | mlog_entry_void(); | 1263 | mlog_entry_void(); |
1264 | 1264 | ||
1265 | osb = kcalloc(1, sizeof(struct ocfs2_super), GFP_KERNEL); | 1265 | osb = kzalloc(sizeof(struct ocfs2_super), GFP_KERNEL); |
1266 | if (!osb) { | 1266 | if (!osb) { |
1267 | status = -ENOMEM; | 1267 | status = -ENOMEM; |
1268 | mlog_errno(status); | 1268 | mlog_errno(status); |
@@ -1387,7 +1387,7 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
1387 | */ | 1387 | */ |
1388 | /* initialize our journal structure */ | 1388 | /* initialize our journal structure */ |
1389 | 1389 | ||
1390 | journal = kcalloc(1, sizeof(struct ocfs2_journal), GFP_KERNEL); | 1390 | journal = kzalloc(sizeof(struct ocfs2_journal), GFP_KERNEL); |
1391 | if (!journal) { | 1391 | if (!journal) { |
1392 | mlog(ML_ERROR, "unable to alloc journal\n"); | 1392 | mlog(ML_ERROR, "unable to alloc journal\n"); |
1393 | status = -ENOMEM; | 1393 | status = -ENOMEM; |