diff options
author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-03-03 13:24:33 -0500 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-03-24 17:58:28 -0500 |
commit | b0697053f9e8de9cea3d510d9e290851ece9460b (patch) | |
tree | bcfa2ae33e4a5302ddbe94dec0eaf95013e79850 /fs/ocfs2/super.c | |
parent | 29004858a76ba9e26393dd8a85e653f105a33753 (diff) |
ocfs2: don't use MLF* in the file system
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r-- | fs/ocfs2/super.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 44d8b5248236..949b3dac30f1 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -1428,8 +1428,9 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
1428 | osb->fs_generation = le32_to_cpu(di->i_fs_generation); | 1428 | osb->fs_generation = le32_to_cpu(di->i_fs_generation); |
1429 | mlog(0, "vol_label: %s\n", osb->vol_label); | 1429 | mlog(0, "vol_label: %s\n", osb->vol_label); |
1430 | mlog(0, "uuid: %s\n", osb->uuid_str); | 1430 | mlog(0, "uuid: %s\n", osb->uuid_str); |
1431 | mlog(0, "root_blkno=%"MLFu64", system_dir_blkno=%"MLFu64"\n", | 1431 | mlog(0, "root_blkno=%llu, system_dir_blkno=%llu\n", |
1432 | osb->root_blkno, osb->system_dir_blkno); | 1432 | (unsigned long long)osb->root_blkno, |
1433 | (unsigned long long)osb->system_dir_blkno); | ||
1433 | 1434 | ||
1434 | osb->osb_dlm_debug = ocfs2_new_dlm_debug(); | 1435 | osb->osb_dlm_debug = ocfs2_new_dlm_debug(); |
1435 | if (!osb->osb_dlm_debug) { | 1436 | if (!osb->osb_dlm_debug) { |
@@ -1472,8 +1473,8 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
1472 | osb->bitmap_cpg = le16_to_cpu(di->id2.i_chain.cl_cpg); | 1473 | osb->bitmap_cpg = le16_to_cpu(di->id2.i_chain.cl_cpg); |
1473 | osb->num_clusters = le32_to_cpu(di->id1.bitmap1.i_total); | 1474 | osb->num_clusters = le32_to_cpu(di->id1.bitmap1.i_total); |
1474 | brelse(bitmap_bh); | 1475 | brelse(bitmap_bh); |
1475 | mlog(0, "cluster bitmap inode: %"MLFu64", clusters per group: %u\n", | 1476 | mlog(0, "cluster bitmap inode: %llu, clusters per group: %u\n", |
1476 | osb->bitmap_blkno, osb->bitmap_cpg); | 1477 | (unsigned long long)osb->bitmap_blkno, osb->bitmap_cpg); |
1477 | 1478 | ||
1478 | status = ocfs2_init_slot_info(osb); | 1479 | status = ocfs2_init_slot_info(osb); |
1479 | if (status < 0) { | 1480 | if (status < 0) { |
@@ -1531,8 +1532,9 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di, | |||
1531 | OCFS2_MINOR_REV_LEVEL); | 1532 | OCFS2_MINOR_REV_LEVEL); |
1532 | } else if (bh->b_blocknr != le64_to_cpu(di->i_blkno)) { | 1533 | } else if (bh->b_blocknr != le64_to_cpu(di->i_blkno)) { |
1533 | mlog(ML_ERROR, "bad block number on superblock: " | 1534 | mlog(ML_ERROR, "bad block number on superblock: " |
1534 | "found %"MLFu64", should be %llu\n", | 1535 | "found %llu, should be %llu\n", |
1535 | di->i_blkno, (unsigned long long)bh->b_blocknr); | 1536 | (unsigned long long)di->i_blkno, |
1537 | (unsigned long long)bh->b_blocknr); | ||
1536 | } else if (le32_to_cpu(di->id2.i_super.s_clustersize_bits) < 12 || | 1538 | } else if (le32_to_cpu(di->id2.i_super.s_clustersize_bits) < 12 || |
1537 | le32_to_cpu(di->id2.i_super.s_clustersize_bits) > 20) { | 1539 | le32_to_cpu(di->id2.i_super.s_clustersize_bits) > 20) { |
1538 | mlog(ML_ERROR, "bad cluster size found: %u\n", | 1540 | mlog(ML_ERROR, "bad cluster size found: %u\n", |