aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/alloc.c88
-rw-r--r--fs/ocfs2/aops.c18
-rw-r--r--fs/ocfs2/buffer_head_io.c11
-rw-r--r--fs/ocfs2/dcache.c9
-rw-r--r--fs/ocfs2/dir.c42
-rw-r--r--fs/ocfs2/dlmglue.c101
-rw-r--r--fs/ocfs2/export.c24
-rw-r--r--fs/ocfs2/extent_map.c34
-rw-r--r--fs/ocfs2/file.c42
-rw-r--r--fs/ocfs2/inode.c116
-rw-r--r--fs/ocfs2/journal.c27
-rw-r--r--fs/ocfs2/localalloc.c17
-rw-r--r--fs/ocfs2/namei.c79
-rw-r--r--fs/ocfs2/ocfs2.h12
-rw-r--r--fs/ocfs2/suballoc.c72
-rw-r--r--fs/ocfs2/super.c14
-rw-r--r--fs/ocfs2/uptodate.c40
-rw-r--r--fs/ocfs2/vote.c63
18 files changed, 425 insertions, 384 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 6b9812db3779..edaab05a93e0 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -566,9 +566,8 @@ static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
566 next_free = le16_to_cpu(el->l_next_free_rec); 566 next_free = le16_to_cpu(el->l_next_free_rec);
567 if (next_free == 0) { 567 if (next_free == 0) {
568 ocfs2_error(inode->i_sb, 568 ocfs2_error(inode->i_sb,
569 "Dinode %"MLFu64" has a bad " 569 "Dinode %llu has a bad extent list",
570 "extent list", 570 (unsigned long long)OCFS2_I(inode)->ip_blkno);
571 OCFS2_I(inode)->ip_blkno);
572 status = -EIO; 571 status = -EIO;
573 goto bail; 572 goto bail;
574 } 573 }
@@ -611,9 +610,8 @@ static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
611 next_free = le16_to_cpu(el->l_next_free_rec); 610 next_free = le16_to_cpu(el->l_next_free_rec);
612 if (next_free == 0) { 611 if (next_free == 0) {
613 ocfs2_error(inode->i_sb, 612 ocfs2_error(inode->i_sb,
614 "Dinode %"MLFu64" has a bad " 613 "Dinode %llu has a bad extent list",
615 "extent list", 614 (unsigned long long)OCFS2_I(inode)->ip_blkno);
616 OCFS2_I(inode)->ip_blkno);
617 status = -EIO; 615 status = -EIO;
618 goto bail; 616 goto bail;
619 } 617 }
@@ -652,8 +650,9 @@ static int ocfs2_do_insert_extent(struct ocfs2_super *osb,
652 /* having an empty extent at eof is legal. */ 650 /* having an empty extent at eof is legal. */
653 if (el->l_recs[i].e_cpos != fe->i_clusters) { 651 if (el->l_recs[i].e_cpos != fe->i_clusters) {
654 ocfs2_error(inode->i_sb, 652 ocfs2_error(inode->i_sb,
655 "Dinode %"MLFu64" trailing extent is bad: " 653 "Dinode %llu trailing extent is bad: "
656 "cpos (%u) != number of clusters (%u)", 654 "cpos (%u) != number of clusters (%u)",
655 (unsigned long long)OCFS2_I(inode)->ip_blkno,
657 le32_to_cpu(el->l_recs[i].e_cpos), 656 le32_to_cpu(el->l_recs[i].e_cpos),
658 le32_to_cpu(fe->i_clusters)); 657 le32_to_cpu(fe->i_clusters));
659 status = -EIO; 658 status = -EIO;
@@ -747,19 +746,19 @@ static int ocfs2_find_branch_target(struct ocfs2_super *osb,
747 746
748 while(le16_to_cpu(el->l_tree_depth) > 1) { 747 while(le16_to_cpu(el->l_tree_depth) > 1) {
749 if (le16_to_cpu(el->l_next_free_rec) == 0) { 748 if (le16_to_cpu(el->l_next_free_rec) == 0) {
750 ocfs2_error(inode->i_sb, "Dinode %"MLFu64" has empty " 749 ocfs2_error(inode->i_sb, "Dinode %llu has empty "
751 "extent list (next_free_rec == 0)", 750 "extent list (next_free_rec == 0)",
752 OCFS2_I(inode)->ip_blkno); 751 (unsigned long long)OCFS2_I(inode)->ip_blkno);
753 status = -EIO; 752 status = -EIO;
754 goto bail; 753 goto bail;
755 } 754 }
756 i = le16_to_cpu(el->l_next_free_rec) - 1; 755 i = le16_to_cpu(el->l_next_free_rec) - 1;
757 blkno = le64_to_cpu(el->l_recs[i].e_blkno); 756 blkno = le64_to_cpu(el->l_recs[i].e_blkno);
758 if (!blkno) { 757 if (!blkno) {
759 ocfs2_error(inode->i_sb, "Dinode %"MLFu64" has extent " 758 ocfs2_error(inode->i_sb, "Dinode %llu has extent "
760 "list where extent # %d has no physical " 759 "list where extent # %d has no physical "
761 "block start", 760 "block start",
762 OCFS2_I(inode)->ip_blkno, i); 761 (unsigned long long)OCFS2_I(inode)->ip_blkno, i);
763 status = -EIO; 762 status = -EIO;
764 goto bail; 763 goto bail;
765 } 764 }
@@ -826,9 +825,9 @@ int ocfs2_insert_extent(struct ocfs2_super *osb,
826 825
827 mlog_entry_void(); 826 mlog_entry_void();
828 827
829 mlog(0, "add %u clusters starting at block %"MLFu64" to " 828 mlog(0, "add %u clusters starting at block %llu to inode %llu\n",
830 "inode %"MLFu64"\n", 829 new_clusters, (unsigned long long)start_blk,
831 new_clusters, start_blk, OCFS2_I(inode)->ip_blkno); 830 (unsigned long long)OCFS2_I(inode)->ip_blkno);
832 831
833 fe = (struct ocfs2_dinode *) fe_bh->b_data; 832 fe = (struct ocfs2_dinode *) fe_bh->b_data;
834 el = &fe->id2.i_list; 833 el = &fe->id2.i_list;
@@ -963,8 +962,8 @@ static int ocfs2_truncate_log_append(struct ocfs2_super *osb,
963 struct ocfs2_dinode *di; 962 struct ocfs2_dinode *di;
964 struct ocfs2_truncate_log *tl; 963 struct ocfs2_truncate_log *tl;
965 964
966 mlog_entry("start_blk = %"MLFu64", num_clusters = %u\n", start_blk, 965 mlog_entry("start_blk = %llu, num_clusters = %u\n",
967 num_clusters); 966 (unsigned long long)start_blk, num_clusters);
968 967
969 BUG_ON(mutex_trylock(&tl_inode->i_mutex)); 968 BUG_ON(mutex_trylock(&tl_inode->i_mutex));
970 969
@@ -981,8 +980,9 @@ static int ocfs2_truncate_log_append(struct ocfs2_super *osb,
981 tl_count = le16_to_cpu(tl->tl_count); 980 tl_count = le16_to_cpu(tl->tl_count);
982 mlog_bug_on_msg(tl_count > ocfs2_truncate_recs_per_inode(osb->sb) || 981 mlog_bug_on_msg(tl_count > ocfs2_truncate_recs_per_inode(osb->sb) ||
983 tl_count == 0, 982 tl_count == 0,
984 "Truncate record count on #%"MLFu64" invalid (" 983 "Truncate record count on #%llu invalid "
985 "wanted %u, actual %u\n", OCFS2_I(tl_inode)->ip_blkno, 984 "wanted %u, actual %u\n",
985 (unsigned long long)OCFS2_I(tl_inode)->ip_blkno,
986 ocfs2_truncate_recs_per_inode(osb->sb), 986 ocfs2_truncate_recs_per_inode(osb->sb),
987 le16_to_cpu(tl->tl_count)); 987 le16_to_cpu(tl->tl_count));
988 988
@@ -1002,8 +1002,8 @@ static int ocfs2_truncate_log_append(struct ocfs2_super *osb,
1002 } 1002 }
1003 1003
1004 mlog(0, "Log truncate of %u clusters starting at cluster %u to " 1004 mlog(0, "Log truncate of %u clusters starting at cluster %u to "
1005 "%"MLFu64" (index = %d)\n", num_clusters, start_cluster, 1005 "%llu (index = %d)\n", num_clusters, start_cluster,
1006 OCFS2_I(tl_inode)->ip_blkno, index); 1006 (unsigned long long)OCFS2_I(tl_inode)->ip_blkno, index);
1007 1007
1008 if (ocfs2_truncate_log_can_coalesce(tl, start_cluster)) { 1008 if (ocfs2_truncate_log_can_coalesce(tl, start_cluster)) {
1009 /* 1009 /*
@@ -1134,8 +1134,8 @@ static int __ocfs2_flush_truncate_log(struct ocfs2_super *osb)
1134 } 1134 }
1135 1135
1136 num_to_flush = le16_to_cpu(tl->tl_used); 1136 num_to_flush = le16_to_cpu(tl->tl_used);
1137 mlog(0, "Flush %u records from truncate log #%"MLFu64"\n", 1137 mlog(0, "Flush %u records from truncate log #%llu\n",
1138 num_to_flush, OCFS2_I(tl_inode)->ip_blkno); 1138 num_to_flush, (unsigned long long)OCFS2_I(tl_inode)->ip_blkno);
1139 if (!num_to_flush) { 1139 if (!num_to_flush) {
1140 status = 0; 1140 status = 0;
1141 goto bail; 1141 goto bail;
@@ -1360,8 +1360,8 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb,
1360 1360
1361 tl = &tl_copy->id2.i_dealloc; 1361 tl = &tl_copy->id2.i_dealloc;
1362 num_recs = le16_to_cpu(tl->tl_used); 1362 num_recs = le16_to_cpu(tl->tl_used);
1363 mlog(0, "cleanup %u records from %"MLFu64"\n", num_recs, 1363 mlog(0, "cleanup %u records from %llu\n", num_recs,
1364 tl_copy->i_blkno); 1364 (unsigned long long)tl_copy->i_blkno);
1365 1365
1366 mutex_lock(&tl_inode->i_mutex); 1366 mutex_lock(&tl_inode->i_mutex);
1367 for(i = 0; i < num_recs; i++) { 1367 for(i = 0; i < num_recs; i++) {
@@ -1529,7 +1529,8 @@ static int ocfs2_find_new_last_ext_blk(struct ocfs2_super *osb,
1529 1529
1530 *new_last_eb = bh; 1530 *new_last_eb = bh;
1531 get_bh(*new_last_eb); 1531 get_bh(*new_last_eb);
1532 mlog(0, "returning block %"MLFu64"\n", le64_to_cpu(eb->h_blkno)); 1532 mlog(0, "returning block %llu\n",
1533 (unsigned long long)le64_to_cpu(eb->h_blkno));
1533bail: 1534bail:
1534 if (bh) 1535 if (bh)
1535 brelse(bh); 1536 brelse(bh);
@@ -1646,8 +1647,8 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
1646 1647
1647 /* if our tree depth > 0, update all the tree blocks below us. */ 1648 /* if our tree depth > 0, update all the tree blocks below us. */
1648 while (depth) { 1649 while (depth) {
1649 mlog(0, "traveling tree (depth = %d, next_eb = %"MLFu64")\n", 1650 mlog(0, "traveling tree (depth = %d, next_eb = %llu)\n",
1650 depth, next_eb); 1651 depth, (unsigned long long)next_eb);
1651 status = ocfs2_read_block(osb, next_eb, &eb_bh, 1652 status = ocfs2_read_block(osb, next_eb, &eb_bh,
1652 OCFS2_BH_CACHED, inode); 1653 OCFS2_BH_CACHED, inode);
1653 if (status < 0) { 1654 if (status < 0) {
@@ -1674,12 +1675,12 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
1674 1675
1675 i = le16_to_cpu(el->l_next_free_rec) - 1; 1676 i = le16_to_cpu(el->l_next_free_rec) - 1;
1676 1677
1677 mlog(0, "extent block %"MLFu64", before: record %d: " 1678 mlog(0, "extent block %llu, before: record %d: "
1678 "(%u, %u, %"MLFu64"), next = %u\n", 1679 "(%u, %u, %llu), next = %u\n",
1679 le64_to_cpu(eb->h_blkno), i, 1680 (unsigned long long)le64_to_cpu(eb->h_blkno), i,
1680 le32_to_cpu(el->l_recs[i].e_cpos), 1681 le32_to_cpu(el->l_recs[i].e_cpos),
1681 le32_to_cpu(el->l_recs[i].e_clusters), 1682 le32_to_cpu(el->l_recs[i].e_clusters),
1682 le64_to_cpu(el->l_recs[i].e_blkno), 1683 (unsigned long long)le64_to_cpu(el->l_recs[i].e_blkno),
1683 le16_to_cpu(el->l_next_free_rec)); 1684 le16_to_cpu(el->l_next_free_rec));
1684 1685
1685 BUG_ON(le32_to_cpu(el->l_recs[i].e_clusters) < clusters_to_del); 1686 BUG_ON(le32_to_cpu(el->l_recs[i].e_clusters) < clusters_to_del);
@@ -1697,12 +1698,12 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb,
1697 BUG_ON(!el->l_next_free_rec); 1698 BUG_ON(!el->l_next_free_rec);
1698 le16_add_cpu(&el->l_next_free_rec, -1); 1699 le16_add_cpu(&el->l_next_free_rec, -1);
1699 } 1700 }
1700 mlog(0, "extent block %"MLFu64", after: record %d: " 1701 mlog(0, "extent block %llu, after: record %d: "
1701 "(%u, %u, %"MLFu64"), next = %u\n", 1702 "(%u, %u, %llu), next = %u\n",
1702 le64_to_cpu(eb->h_blkno), i, 1703 (unsigned long long)le64_to_cpu(eb->h_blkno), i,
1703 le32_to_cpu(el->l_recs[i].e_cpos), 1704 le32_to_cpu(el->l_recs[i].e_cpos),
1704 le32_to_cpu(el->l_recs[i].e_clusters), 1705 le32_to_cpu(el->l_recs[i].e_clusters),
1705 le64_to_cpu(el->l_recs[i].e_blkno), 1706 (unsigned long long)le64_to_cpu(el->l_recs[i].e_blkno),
1706 le16_to_cpu(el->l_next_free_rec)); 1707 le16_to_cpu(el->l_next_free_rec));
1707 1708
1708 status = ocfs2_journal_dirty(handle, eb_bh); 1709 status = ocfs2_journal_dirty(handle, eb_bh);
@@ -1792,10 +1793,10 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb,
1792 last_eb = le64_to_cpu(fe->i_last_eb_blk); 1793 last_eb = le64_to_cpu(fe->i_last_eb_blk);
1793start: 1794start:
1794 mlog(0, "ocfs2_commit_truncate: fe->i_clusters = %u, " 1795 mlog(0, "ocfs2_commit_truncate: fe->i_clusters = %u, "
1795 "last_eb = %"MLFu64", fe->i_last_eb_blk = %"MLFu64", " 1796 "last_eb = %llu, fe->i_last_eb_blk = %llu, "
1796 "fe->id2.i_list.l_tree_depth = %u last_eb_bh = %p\n", 1797 "fe->id2.i_list.l_tree_depth = %u last_eb_bh = %p\n",
1797 le32_to_cpu(fe->i_clusters), last_eb, 1798 le32_to_cpu(fe->i_clusters), (unsigned long long)last_eb,
1798 le64_to_cpu(fe->i_last_eb_blk), 1799 (unsigned long long)le64_to_cpu(fe->i_last_eb_blk),
1799 le16_to_cpu(fe->id2.i_list.l_tree_depth), last_eb_bh); 1800 le16_to_cpu(fe->id2.i_list.l_tree_depth), last_eb_bh);
1800 1801
1801 if (last_eb != le64_to_cpu(fe->i_last_eb_blk)) { 1802 if (last_eb != le64_to_cpu(fe->i_last_eb_blk)) {
@@ -1934,16 +1935,17 @@ int ocfs2_prepare_truncate(struct ocfs2_super *osb,
1934 fe = (struct ocfs2_dinode *) fe_bh->b_data; 1935 fe = (struct ocfs2_dinode *) fe_bh->b_data;
1935 1936
1936 mlog(0, "fe->i_clusters = %u, new_i_clusters = %u, fe->i_size =" 1937 mlog(0, "fe->i_clusters = %u, new_i_clusters = %u, fe->i_size ="
1937 "%"MLFu64"\n", fe->i_clusters, new_i_clusters, fe->i_size); 1938 "%llu\n", fe->i_clusters, new_i_clusters,
1939 (unsigned long long)fe->i_size);
1938 1940
1939 if (le32_to_cpu(fe->i_clusters) <= new_i_clusters) { 1941 if (le32_to_cpu(fe->i_clusters) <= new_i_clusters) {
1940 ocfs2_error(inode->i_sb, "Dinode %"MLFu64" has cluster count " 1942 ocfs2_error(inode->i_sb, "Dinode %llu has cluster count "
1941 "%u and size %"MLFu64" whereas struct inode has " 1943 "%u and size %llu whereas struct inode has "
1942 "cluster count %u and size %llu which caused an " 1944 "cluster count %u and size %llu which caused an "
1943 "invalid truncate to %u clusters.", 1945 "invalid truncate to %u clusters.",
1944 le64_to_cpu(fe->i_blkno), 1946 (unsigned long long)le64_to_cpu(fe->i_blkno),
1945 le32_to_cpu(fe->i_clusters), 1947 le32_to_cpu(fe->i_clusters),
1946 le64_to_cpu(fe->i_size), 1948 (unsigned long long)le64_to_cpu(fe->i_size),
1947 OCFS2_I(inode)->ip_clusters, i_size_read(inode), 1949 OCFS2_I(inode)->ip_clusters, i_size_read(inode),
1948 new_i_clusters); 1950 new_i_clusters);
1949 mlog_meta_lvb(ML_ERROR, &OCFS2_I(inode)->ip_meta_lockres); 1951 mlog_meta_lvb(ML_ERROR, &OCFS2_I(inode)->ip_meta_lockres);
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 8f4467a930a5..bf931ba1d364 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -74,8 +74,8 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
74 fe = (struct ocfs2_dinode *) bh->b_data; 74 fe = (struct ocfs2_dinode *) bh->b_data;
75 75
76 if (!OCFS2_IS_VALID_DINODE(fe)) { 76 if (!OCFS2_IS_VALID_DINODE(fe)) {
77 mlog(ML_ERROR, "Invalid dinode #%"MLFu64": signature = %.*s\n", 77 mlog(ML_ERROR, "Invalid dinode #%llu: signature = %.*s\n",
78 fe->i_blkno, 7, fe->i_signature); 78 (unsigned long long)fe->i_blkno, 7, fe->i_signature);
79 goto bail; 79 goto bail;
80 } 80 }
81 81
@@ -162,8 +162,8 @@ static int ocfs2_get_block(struct inode *inode, sector_t iblock,
162 NULL); 162 NULL);
163 if (err) { 163 if (err) {
164 mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, " 164 mlog(ML_ERROR, "Error %d from get_blocks(0x%p, %llu, 1, "
165 "%"MLFu64", NULL)\n", err, inode, 165 "%llu, NULL)\n", err, inode, (unsigned long long)iblock,
166 (unsigned long long)iblock, p_blkno); 166 (unsigned long long)p_blkno);
167 goto bail; 167 goto bail;
168 } 168 }
169 169
@@ -171,13 +171,15 @@ static int ocfs2_get_block(struct inode *inode, sector_t iblock,
171 171
172 if (bh_result->b_blocknr == 0) { 172 if (bh_result->b_blocknr == 0) {
173 err = -EIO; 173 err = -EIO;
174 mlog(ML_ERROR, "iblock = %llu p_blkno = %"MLFu64" " 174 mlog(ML_ERROR, "iblock = %llu p_blkno = %llu blkno=(%llu)\n",
175 "blkno=(%"MLFu64")\n", (unsigned long long)iblock, 175 (unsigned long long)iblock,
176 p_blkno, OCFS2_I(inode)->ip_blkno); 176 (unsigned long long)p_blkno,
177 (unsigned long long)OCFS2_I(inode)->ip_blkno);
177 } 178 }
178 179
179 past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode)); 180 past_eof = ocfs2_blocks_for_bytes(inode->i_sb, i_size_read(inode));
180 mlog(0, "Inode %lu, past_eof = %"MLFu64"\n", inode->i_ino, past_eof); 181 mlog(0, "Inode %lu, past_eof = %llu\n", inode->i_ino,
182 (unsigned long long)past_eof);
181 183
182 if (create && (iblock >= past_eof)) 184 if (create && (iblock >= past_eof))
183 set_buffer_new(bh_result); 185 set_buffer_new(bh_result);
diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c
index bae3d7548bea..9a24adf9be6e 100644
--- a/fs/ocfs2/buffer_head_io.c
+++ b/fs/ocfs2/buffer_head_io.c
@@ -97,8 +97,8 @@ int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
97 int i, ignore_cache = 0; 97 int i, ignore_cache = 0;
98 struct buffer_head *bh; 98 struct buffer_head *bh;
99 99
100 mlog_entry("(block=(%"MLFu64"), nr=(%d), flags=%d, inode=%p)\n", 100 mlog_entry("(block=(%llu), nr=(%d), flags=%d, inode=%p)\n",
101 block, nr, flags, inode); 101 (unsigned long long)block, nr, flags, inode);
102 102
103 if (osb == NULL || osb->sb == NULL || bhs == NULL) { 103 if (osb == NULL || osb->sb == NULL || bhs == NULL) {
104 status = -EINVAL; 104 status = -EINVAL;
@@ -143,9 +143,9 @@ int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
143 if (flags & OCFS2_BH_CACHED && 143 if (flags & OCFS2_BH_CACHED &&
144 !ocfs2_buffer_uptodate(inode, bh)) { 144 !ocfs2_buffer_uptodate(inode, bh)) {
145 mlog(ML_UPTODATE, 145 mlog(ML_UPTODATE,
146 "bh (%llu), inode %"MLFu64" not uptodate\n", 146 "bh (%llu), inode %llu not uptodate\n",
147 (unsigned long long)bh->b_blocknr, 147 (unsigned long long)bh->b_blocknr,
148 OCFS2_I(inode)->ip_blkno); 148 (unsigned long long)OCFS2_I(inode)->ip_blkno);
149 ignore_cache = 1; 149 ignore_cache = 1;
150 } 150 }
151 151
@@ -222,7 +222,8 @@ int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
222 if (inode) 222 if (inode)
223 mutex_unlock(&OCFS2_I(inode)->ip_io_mutex); 223 mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);
224 224
225 mlog(ML_BH_IO, "block=(%"MLFu64"), nr=(%d), cached=%s\n", block, nr, 225 mlog(ML_BH_IO, "block=(%llu), nr=(%d), cached=%s\n",
226 (unsigned long long)block, nr,
226 (!(flags & OCFS2_BH_CACHED) || ignore_cache) ? "no" : "yes"); 227 (!(flags & OCFS2_BH_CACHED) || ignore_cache) ? "no" : "yes");
227 228
228bail: 229bail:
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index bd85182e97bc..1a01380e3878 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -64,15 +64,16 @@ static int ocfs2_dentry_revalidate(struct dentry *dentry,
64 /* did we or someone else delete this inode? */ 64 /* did we or someone else delete this inode? */
65 if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_DELETED) { 65 if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_DELETED) {
66 spin_unlock(&OCFS2_I(inode)->ip_lock); 66 spin_unlock(&OCFS2_I(inode)->ip_lock);
67 mlog(0, "inode (%"MLFu64") deleted, returning false\n", 67 mlog(0, "inode (%llu) deleted, returning false\n",
68 OCFS2_I(inode)->ip_blkno); 68 (unsigned long long)OCFS2_I(inode)->ip_blkno);
69 goto bail; 69 goto bail;
70 } 70 }
71 spin_unlock(&OCFS2_I(inode)->ip_lock); 71 spin_unlock(&OCFS2_I(inode)->ip_lock);
72 72
73 if (!inode->i_nlink) { 73 if (!inode->i_nlink) {
74 mlog(0, "Inode %"MLFu64" orphaned, returning false " 74 mlog(0, "Inode %llu orphaned, returning false "
75 "dir = %d\n", OCFS2_I(inode)->ip_blkno, 75 "dir = %d\n",
76 (unsigned long long)OCFS2_I(inode)->ip_blkno,
76 S_ISDIR(inode->i_mode)); 77 S_ISDIR(inode->i_mode));
77 goto bail; 78 goto bail;
78 } 79 }
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 57158fa75d91..ae47f450792f 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -83,7 +83,8 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
83 struct super_block * sb = inode->i_sb; 83 struct super_block * sb = inode->i_sb;
84 int have_disk_lock = 0; 84 int have_disk_lock = 0;
85 85
86 mlog_entry("dirino=%"MLFu64"\n", OCFS2_I(inode)->ip_blkno); 86 mlog_entry("dirino=%llu\n",
87 (unsigned long long)OCFS2_I(inode)->ip_blkno);
87 88
88 stored = 0; 89 stored = 0;
89 bh = NULL; 90 bh = NULL;
@@ -104,9 +105,9 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
104 blk = (filp->f_pos) >> sb->s_blocksize_bits; 105 blk = (filp->f_pos) >> sb->s_blocksize_bits;
105 bh = ocfs2_bread(inode, blk, &err, 0); 106 bh = ocfs2_bread(inode, blk, &err, 0);
106 if (!bh) { 107 if (!bh) {
107 mlog(ML_ERROR, "directory #%"MLFu64" contains a hole " 108 mlog(ML_ERROR,
108 "at offset %lld\n", 109 "directory #%llu contains a hole at offset %lld\n",
109 OCFS2_I(inode)->ip_blkno, 110 (unsigned long long)OCFS2_I(inode)->ip_blkno,
110 filp->f_pos); 111 filp->f_pos);
111 filp->f_pos += sb->s_blocksize - offset; 112 filp->f_pos += sb->s_blocksize - offset;
112 continue; 113 continue;
@@ -214,9 +215,9 @@ int ocfs2_find_files_on_disk(const char *name,
214 int status = -ENOENT; 215 int status = -ENOENT;
215 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); 216 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
216 217
217 mlog_entry("(osb=%p, parent=%"MLFu64", name='%.*s', blkno=%p, " 218 mlog_entry("(osb=%p, parent=%llu, name='%.*s', blkno=%p, inode=%p)\n",
218 "inode=%p)\n", 219 osb, (unsigned long long)OCFS2_I(inode)->ip_blkno,
219 osb, OCFS2_I(inode)->ip_blkno, namelen, name, blkno, inode); 220 namelen, name, blkno, inode);
220 221
221 *dirent_bh = ocfs2_find_entry(name, namelen, inode, dirent); 222 *dirent_bh = ocfs2_find_entry(name, namelen, inode, dirent);
222 if (!*dirent_bh || !*dirent) { 223 if (!*dirent_bh || !*dirent) {
@@ -255,8 +256,8 @@ int ocfs2_check_dir_for_entry(struct inode *dir,
255 struct buffer_head *dirent_bh = NULL; 256 struct buffer_head *dirent_bh = NULL;
256 struct ocfs2_dir_entry *dirent = NULL; 257 struct ocfs2_dir_entry *dirent = NULL;
257 258
258 mlog_entry("dir %"MLFu64", name '%.*s'\n", OCFS2_I(dir)->ip_blkno, 259 mlog_entry("dir %llu, name '%.*s'\n",
259 namelen, name); 260 (unsigned long long)OCFS2_I(dir)->ip_blkno, namelen, name);
260 261
261 ret = -EEXIST; 262 ret = -EEXIST;
262 dirent_bh = ocfs2_find_entry(name, namelen, dir, &dirent); 263 dirent_bh = ocfs2_find_entry(name, namelen, dir, &dirent);
@@ -287,9 +288,8 @@ int ocfs2_empty_dir(struct inode *inode)
287 if ((i_size_read(inode) < 288 if ((i_size_read(inode) <
288 (OCFS2_DIR_REC_LEN(1) + OCFS2_DIR_REC_LEN(2))) || 289 (OCFS2_DIR_REC_LEN(1) + OCFS2_DIR_REC_LEN(2))) ||
289 !(bh = ocfs2_bread(inode, 0, &err, 0))) { 290 !(bh = ocfs2_bread(inode, 0, &err, 0))) {
290 mlog(ML_ERROR, "bad directory (dir #%"MLFu64") - " 291 mlog(ML_ERROR, "bad directory (dir #%llu) - no data block\n",
291 "no data block\n", 292 (unsigned long long)OCFS2_I(inode)->ip_blkno);
292 OCFS2_I(inode)->ip_blkno);
293 return 1; 293 return 1;
294 } 294 }
295 295
@@ -300,9 +300,8 @@ int ocfs2_empty_dir(struct inode *inode)
300 !le64_to_cpu(de1->inode) || 300 !le64_to_cpu(de1->inode) ||
301 strcmp(".", de->name) || 301 strcmp(".", de->name) ||
302 strcmp("..", de1->name)) { 302 strcmp("..", de1->name)) {
303 mlog(ML_ERROR, "bad directory (dir #%"MLFu64") - " 303 mlog(ML_ERROR, "bad directory (dir #%llu) - no `.' or `..'\n",
304 "no `.' or `..'\n", 304 (unsigned long long)OCFS2_I(inode)->ip_blkno);
305 OCFS2_I(inode)->ip_blkno);
306 brelse(bh); 305 brelse(bh);
307 return 1; 306 return 1;
308 } 307 }
@@ -314,9 +313,8 @@ int ocfs2_empty_dir(struct inode *inode)
314 bh = ocfs2_bread(inode, 313 bh = ocfs2_bread(inode,
315 offset >> sb->s_blocksize_bits, &err, 0); 314 offset >> sb->s_blocksize_bits, &err, 0);
316 if (!bh) { 315 if (!bh) {
317 mlog(ML_ERROR, "directory #%"MLFu64" contains " 316 mlog(ML_ERROR, "dir %llu has a hole at %lu\n",
318 "a hole at offset %lu\n", 317 (unsigned long long)OCFS2_I(inode)->ip_blkno, offset);
319 OCFS2_I(inode)->ip_blkno, offset);
320 offset += sb->s_blocksize; 318 offset += sb->s_blocksize;
321 continue; 319 continue;
322 } 320 }
@@ -406,8 +404,8 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
406 mlog_entry_void(); 404 mlog_entry_void();
407 405
408 dir_i_size = i_size_read(dir); 406 dir_i_size = i_size_read(dir);
409 mlog(0, "extending dir %"MLFu64" (i_size = %lld)\n", 407 mlog(0, "extending dir %llu (i_size = %lld)\n",
410 OCFS2_I(dir)->ip_blkno, dir_i_size); 408 (unsigned long long)OCFS2_I(dir)->ip_blkno, dir_i_size);
411 409
412 handle = ocfs2_alloc_handle(osb); 410 handle = ocfs2_alloc_handle(osb);
413 if (handle == NULL) { 411 if (handle == NULL) {
@@ -531,8 +529,8 @@ int ocfs2_prepare_dir_for_insert(struct ocfs2_super *osb,
531 529
532 mlog_entry_void(); 530 mlog_entry_void();
533 531
534 mlog(0, "getting ready to insert namelen %d into dir %"MLFu64"\n", 532 mlog(0, "getting ready to insert namelen %d into dir %llu\n",
535 namelen, OCFS2_I(dir)->ip_blkno); 533 namelen, (unsigned long long)OCFS2_I(dir)->ip_blkno);
536 534
537 BUG_ON(!S_ISDIR(dir->i_mode)); 535 BUG_ON(!S_ISDIR(dir->i_mode));
538 fe = (struct ocfs2_dinode *) parent_fe_bh->b_data; 536 fe = (struct ocfs2_dinode *) parent_fe_bh->b_data;
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index e971ec2f8407..84f153aca692 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -231,9 +231,9 @@ static void ocfs2_build_lock_name(enum ocfs2_lock_type type,
231 231
232 BUG_ON(type >= OCFS2_NUM_LOCK_TYPES); 232 BUG_ON(type >= OCFS2_NUM_LOCK_TYPES);
233 233
234 len = snprintf(name, OCFS2_LOCK_ID_MAX_LEN, "%c%s%016"MLFx64"%08x", 234 len = snprintf(name, OCFS2_LOCK_ID_MAX_LEN, "%c%s%016llx%08x",
235 ocfs2_lock_type_char(type), OCFS2_LOCK_ID_PAD, blkno, 235 ocfs2_lock_type_char(type), OCFS2_LOCK_ID_PAD,
236 generation); 236 (long long)blkno, generation);
237 237
238 BUG_ON(len != (OCFS2_LOCK_ID_MAX_LEN - 1)); 238 BUG_ON(len != (OCFS2_LOCK_ID_MAX_LEN - 1));
239 239
@@ -533,8 +533,8 @@ static void ocfs2_inode_ast_func(void *opaque)
533 533
534 inode = ocfs2_lock_res_inode(lockres); 534 inode = ocfs2_lock_res_inode(lockres);
535 535
536 mlog(0, "AST fired for inode %"MLFu64", l_action = %u, type = %s\n", 536 mlog(0, "AST fired for inode %llu, l_action = %u, type = %s\n",
537 OCFS2_I(inode)->ip_blkno, lockres->l_action, 537 (unsigned long long)OCFS2_I(inode)->ip_blkno, lockres->l_action,
538 ocfs2_lock_type_string(lockres->l_type)); 538 ocfs2_lock_type_string(lockres->l_type));
539 539
540 BUG_ON(!ocfs2_is_inode_lock(lockres)); 540 BUG_ON(!ocfs2_is_inode_lock(lockres));
@@ -544,8 +544,8 @@ static void ocfs2_inode_ast_func(void *opaque)
544 lksb = &(lockres->l_lksb); 544 lksb = &(lockres->l_lksb);
545 if (lksb->status != DLM_NORMAL) { 545 if (lksb->status != DLM_NORMAL) {
546 mlog(ML_ERROR, "ocfs2_inode_ast_func: lksb status value of %u " 546 mlog(ML_ERROR, "ocfs2_inode_ast_func: lksb status value of %u "
547 "on inode %"MLFu64"\n", lksb->status, 547 "on inode %llu\n", lksb->status,
548 OCFS2_I(inode)->ip_blkno); 548 (unsigned long long)OCFS2_I(inode)->ip_blkno);
549 spin_unlock_irqrestore(&lockres->l_lock, flags); 549 spin_unlock_irqrestore(&lockres->l_lock, flags);
550 mlog_exit_void(); 550 mlog_exit_void();
551 return; 551 return;
@@ -646,10 +646,9 @@ static void ocfs2_inode_bast_func(void *opaque, int level)
646 inode = ocfs2_lock_res_inode(lockres); 646 inode = ocfs2_lock_res_inode(lockres);
647 osb = OCFS2_SB(inode->i_sb); 647 osb = OCFS2_SB(inode->i_sb);
648 648
649 mlog(0, "BAST fired for inode %"MLFu64", blocking = %d, level = %d " 649 mlog(0, "BAST fired for inode %llu, blocking %d, level %d type %s\n",
650 "type = %s\n", OCFS2_I(inode)->ip_blkno, level, 650 (unsigned long long)OCFS2_I(inode)->ip_blkno, level,
651 lockres->l_level, 651 lockres->l_level, ocfs2_lock_type_string(lockres->l_type));
652 ocfs2_lock_type_string(lockres->l_type));
653 652
654 ocfs2_generic_bast_func(osb, lockres, level); 653 ocfs2_generic_bast_func(osb, lockres, level);
655 654
@@ -1104,7 +1103,7 @@ int ocfs2_create_new_inode_locks(struct inode *inode)
1104 1103
1105 mlog_entry_void(); 1104 mlog_entry_void();
1106 1105
1107 mlog(0, "Inode %"MLFu64"\n", OCFS2_I(inode)->ip_blkno); 1106 mlog(0, "Inode %llu\n", (unsigned long long)OCFS2_I(inode)->ip_blkno);
1108 1107
1109 /* NOTE: That we don't increment any of the holder counts, nor 1108 /* NOTE: That we don't increment any of the holder counts, nor
1110 * do we add anything to a journal handle. Since this is 1109 * do we add anything to a journal handle. Since this is
@@ -1149,8 +1148,8 @@ int ocfs2_rw_lock(struct inode *inode, int write)
1149 1148
1150 mlog_entry_void(); 1149 mlog_entry_void();
1151 1150
1152 mlog(0, "inode %"MLFu64" take %s RW lock\n", 1151 mlog(0, "inode %llu take %s RW lock\n",
1153 OCFS2_I(inode)->ip_blkno, 1152 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1154 write ? "EXMODE" : "PRMODE"); 1153 write ? "EXMODE" : "PRMODE");
1155 1154
1156 lockres = &OCFS2_I(inode)->ip_rw_lockres; 1155 lockres = &OCFS2_I(inode)->ip_rw_lockres;
@@ -1173,8 +1172,8 @@ void ocfs2_rw_unlock(struct inode *inode, int write)
1173 1172
1174 mlog_entry_void(); 1173 mlog_entry_void();
1175 1174
1176 mlog(0, "inode %"MLFu64" drop %s RW lock\n", 1175 mlog(0, "inode %llu drop %s RW lock\n",
1177 OCFS2_I(inode)->ip_blkno, 1176 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1178 write ? "EXMODE" : "PRMODE"); 1177 write ? "EXMODE" : "PRMODE");
1179 1178
1180 ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level); 1179 ocfs2_cluster_unlock(OCFS2_SB(inode->i_sb), lockres, level);
@@ -1193,8 +1192,8 @@ int ocfs2_data_lock_full(struct inode *inode,
1193 1192
1194 mlog_entry_void(); 1193 mlog_entry_void();
1195 1194
1196 mlog(0, "inode %"MLFu64" take %s DATA lock\n", 1195 mlog(0, "inode %llu take %s DATA lock\n",
1197 OCFS2_I(inode)->ip_blkno, 1196 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1198 write ? "EXMODE" : "PRMODE"); 1197 write ? "EXMODE" : "PRMODE");
1199 1198
1200 /* We'll allow faking a readonly data lock for 1199 /* We'll allow faking a readonly data lock for
@@ -1278,8 +1277,8 @@ void ocfs2_data_unlock(struct inode *inode,
1278 1277
1279 mlog_entry_void(); 1278 mlog_entry_void();
1280 1279
1281 mlog(0, "inode %"MLFu64" drop %s DATA lock\n", 1280 mlog(0, "inode %llu drop %s DATA lock\n",
1282 OCFS2_I(inode)->ip_blkno, 1281 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1283 write ? "EXMODE" : "PRMODE"); 1282 write ? "EXMODE" : "PRMODE");
1284 1283
1285 if (!ocfs2_is_hard_readonly(OCFS2_SB(inode->i_sb))) 1284 if (!ocfs2_is_hard_readonly(OCFS2_SB(inode->i_sb)))
@@ -1462,9 +1461,9 @@ static int ocfs2_meta_lock_update(struct inode *inode,
1462 1461
1463 spin_lock(&oi->ip_lock); 1462 spin_lock(&oi->ip_lock);
1464 if (oi->ip_flags & OCFS2_INODE_DELETED) { 1463 if (oi->ip_flags & OCFS2_INODE_DELETED) {
1465 mlog(0, "Orphaned inode %"MLFu64" was deleted while we " 1464 mlog(0, "Orphaned inode %llu was deleted while we "
1466 "were waiting on a lock. ip_flags = 0x%x\n", 1465 "were waiting on a lock. ip_flags = 0x%x\n",
1467 oi->ip_blkno, oi->ip_flags); 1466 (unsigned long long)oi->ip_blkno, oi->ip_flags);
1468 spin_unlock(&oi->ip_lock); 1467 spin_unlock(&oi->ip_lock);
1469 status = -ENOENT; 1468 status = -ENOENT;
1470 goto bail; 1469 goto bail;
@@ -1485,8 +1484,8 @@ static int ocfs2_meta_lock_update(struct inode *inode,
1485 ocfs2_extent_map_trunc(inode, 0); 1484 ocfs2_extent_map_trunc(inode, 0);
1486 1485
1487 if (ocfs2_meta_lvb_is_trustable(lockres)) { 1486 if (ocfs2_meta_lvb_is_trustable(lockres)) {
1488 mlog(0, "Trusting LVB on inode %"MLFu64"\n", 1487 mlog(0, "Trusting LVB on inode %llu\n",
1489 oi->ip_blkno); 1488 (unsigned long long)oi->ip_blkno);
1490 ocfs2_refresh_inode_from_lvb(inode); 1489 ocfs2_refresh_inode_from_lvb(inode);
1491 } else { 1490 } else {
1492 /* Boo, we have to go to disk. */ 1491 /* Boo, we have to go to disk. */
@@ -1514,15 +1513,16 @@ static int ocfs2_meta_lock_update(struct inode *inode,
1514 } 1513 }
1515 mlog_bug_on_msg(inode->i_generation != 1514 mlog_bug_on_msg(inode->i_generation !=
1516 le32_to_cpu(fe->i_generation), 1515 le32_to_cpu(fe->i_generation),
1517 "Invalid dinode %"MLFu64" disk generation: %u " 1516 "Invalid dinode %llu disk generation: %u "
1518 "inode->i_generation: %u\n", 1517 "inode->i_generation: %u\n",
1519 oi->ip_blkno, le32_to_cpu(fe->i_generation), 1518 (unsigned long long)oi->ip_blkno,
1519 le32_to_cpu(fe->i_generation),
1520 inode->i_generation); 1520 inode->i_generation);
1521 mlog_bug_on_msg(le64_to_cpu(fe->i_dtime) || 1521 mlog_bug_on_msg(le64_to_cpu(fe->i_dtime) ||
1522 !(fe->i_flags & cpu_to_le32(OCFS2_VALID_FL)), 1522 !(fe->i_flags & cpu_to_le32(OCFS2_VALID_FL)),
1523 "Stale dinode %"MLFu64" dtime: %"MLFu64" " 1523 "Stale dinode %llu dtime: %llu flags: 0x%x\n",
1524 "flags: 0x%x\n", oi->ip_blkno, 1524 (unsigned long long)oi->ip_blkno,
1525 le64_to_cpu(fe->i_dtime), 1525 (unsigned long long)le64_to_cpu(fe->i_dtime),
1526 le32_to_cpu(fe->i_flags)); 1526 le32_to_cpu(fe->i_flags));
1527 1527
1528 ocfs2_refresh_inode(inode, fe); 1528 ocfs2_refresh_inode(inode, fe);
@@ -1581,8 +1581,8 @@ int ocfs2_meta_lock_full(struct inode *inode,
1581 1581
1582 mlog_entry_void(); 1582 mlog_entry_void();
1583 1583
1584 mlog(0, "inode %"MLFu64", take %s META lock\n", 1584 mlog(0, "inode %llu, take %s META lock\n",
1585 OCFS2_I(inode)->ip_blkno, 1585 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1586 ex ? "EXMODE" : "PRMODE"); 1586 ex ? "EXMODE" : "PRMODE");
1587 1587
1588 status = 0; 1588 status = 0;
@@ -1716,8 +1716,8 @@ void ocfs2_meta_unlock(struct inode *inode,
1716 1716
1717 mlog_entry_void(); 1717 mlog_entry_void();
1718 1718
1719 mlog(0, "inode %"MLFu64" drop %s META lock\n", 1719 mlog(0, "inode %llu drop %s META lock\n",
1720 OCFS2_I(inode)->ip_blkno, 1720 (unsigned long long)OCFS2_I(inode)->ip_blkno,
1721 ex ? "EXMODE" : "PRMODE"); 1721 ex ? "EXMODE" : "PRMODE");
1722 1722
1723 if (!ocfs2_is_hard_readonly(OCFS2_SB(inode->i_sb))) 1723 if (!ocfs2_is_hard_readonly(OCFS2_SB(inode->i_sb)))
@@ -2686,8 +2686,8 @@ static void ocfs2_data_convert_worker(struct ocfs2_lock_res *lockres,
2686 mapping = inode->i_mapping; 2686 mapping = inode->i_mapping;
2687 2687
2688 if (filemap_fdatawrite(mapping)) { 2688 if (filemap_fdatawrite(mapping)) {
2689 mlog(ML_ERROR, "Could not sync inode %"MLFu64" for downconvert!", 2689 mlog(ML_ERROR, "Could not sync inode %llu for downconvert!",
2690 OCFS2_I(inode)->ip_blkno); 2690 (unsigned long long)OCFS2_I(inode)->ip_blkno);
2691 } 2691 }
2692 sync_mapping_buffers(mapping); 2692 sync_mapping_buffers(mapping);
2693 if (blocking == LKM_EXMODE) { 2693 if (blocking == LKM_EXMODE) {
@@ -2717,7 +2717,8 @@ int ocfs2_unblock_data(struct ocfs2_lock_res *lockres,
2717 inode = ocfs2_lock_res_inode(lockres); 2717 inode = ocfs2_lock_res_inode(lockres);
2718 osb = OCFS2_SB(inode->i_sb); 2718 osb = OCFS2_SB(inode->i_sb);
2719 2719
2720 mlog(0, "unblock inode %"MLFu64"\n", OCFS2_I(inode)->ip_blkno); 2720 mlog(0, "unblock inode %llu\n",
2721 (unsigned long long)OCFS2_I(inode)->ip_blkno);
2721 2722
2722 status = ocfs2_generic_unblock_lock(osb, 2723 status = ocfs2_generic_unblock_lock(osb,
2723 lockres, 2724 lockres,
@@ -2726,8 +2727,8 @@ int ocfs2_unblock_data(struct ocfs2_lock_res *lockres,
2726 if (status < 0) 2727 if (status < 0)
2727 mlog_errno(status); 2728 mlog_errno(status);
2728 2729
2729 mlog(0, "inode %"MLFu64", requeue = %d\n", 2730 mlog(0, "inode %llu, requeue = %d\n",
2730 OCFS2_I(inode)->ip_blkno, *requeue); 2731 (unsigned long long)OCFS2_I(inode)->ip_blkno, *requeue);
2731 2732
2732 mlog_exit(status); 2733 mlog_exit(status);
2733 return status; 2734 return status;
@@ -2767,14 +2768,15 @@ int ocfs2_unblock_meta(struct ocfs2_lock_res *lockres,
2767 2768
2768 inode = ocfs2_lock_res_inode(lockres); 2769 inode = ocfs2_lock_res_inode(lockres);
2769 2770
2770 mlog(0, "unblock inode %"MLFu64"\n", OCFS2_I(inode)->ip_blkno); 2771 mlog(0, "unblock inode %llu\n",
2772 (unsigned long long)OCFS2_I(inode)->ip_blkno);
2771 2773
2772 status = ocfs2_do_unblock_meta(inode, requeue); 2774 status = ocfs2_do_unblock_meta(inode, requeue);
2773 if (status < 0) 2775 if (status < 0)
2774 mlog_errno(status); 2776 mlog_errno(status);
2775 2777
2776 mlog(0, "inode %"MLFu64", requeue = %d\n", 2778 mlog(0, "inode %llu, requeue = %d\n",
2777 OCFS2_I(inode)->ip_blkno, *requeue); 2779 (unsigned long long)OCFS2_I(inode)->ip_blkno, *requeue);
2778 2780
2779 mlog_exit(status); 2781 mlog_exit(status);
2780 return status; 2782 return status;
@@ -2893,12 +2895,13 @@ void ocfs2_dump_meta_lvb_info(u64 level,
2893 lockres->l_name, function, line); 2895 lockres->l_name, function, line);
2894 mlog(level, "version: %u, clusters: %u\n", 2896 mlog(level, "version: %u, clusters: %u\n",
2895 be32_to_cpu(lvb->lvb_version), be32_to_cpu(lvb->lvb_iclusters)); 2897 be32_to_cpu(lvb->lvb_version), be32_to_cpu(lvb->lvb_iclusters));
2896 mlog(level, "size: %"MLFu64", uid %u, gid %u, mode 0x%x\n", 2898 mlog(level, "size: %llu, uid %u, gid %u, mode 0x%x\n",
2897 be64_to_cpu(lvb->lvb_isize), be32_to_cpu(lvb->lvb_iuid), 2899 (unsigned long long)be64_to_cpu(lvb->lvb_isize),
2898 be32_to_cpu(lvb->lvb_igid), be16_to_cpu(lvb->lvb_imode)); 2900 be32_to_cpu(lvb->lvb_iuid), be32_to_cpu(lvb->lvb_igid),
2899 mlog(level, "nlink %u, atime_packed 0x%"MLFx64", " 2901 be16_to_cpu(lvb->lvb_imode));
2900 "ctime_packed 0x%"MLFx64", mtime_packed 0x%"MLFx64"\n", 2902 mlog(level, "nlink %u, atime_packed 0x%llx, ctime_packed 0x%llx, "
2901 be16_to_cpu(lvb->lvb_inlink), be64_to_cpu(lvb->lvb_iatime_packed), 2903 "mtime_packed 0x%llx\n", be16_to_cpu(lvb->lvb_inlink),
2902 be64_to_cpu(lvb->lvb_ictime_packed), 2904 (long long)be64_to_cpu(lvb->lvb_iatime_packed),
2903 be64_to_cpu(lvb->lvb_imtime_packed)); 2905 (long long)be64_to_cpu(lvb->lvb_ictime_packed),
2906 (long long)be64_to_cpu(lvb->lvb_imtime_packed));
2904} 2907}
diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c
index 5810160d92a8..ec55ab3c1214 100644
--- a/fs/ocfs2/export.c
+++ b/fs/ocfs2/export.c
@@ -95,8 +95,8 @@ static struct dentry *ocfs2_get_parent(struct dentry *child)
95 mlog_entry("(0x%p, '%.*s')\n", child, 95 mlog_entry("(0x%p, '%.*s')\n", child,
96 child->d_name.len, child->d_name.name); 96 child->d_name.len, child->d_name.name);
97 97
98 mlog(0, "find parent of directory %"MLFu64"\n", 98 mlog(0, "find parent of directory %llu\n",
99 OCFS2_I(dir)->ip_blkno); 99 (unsigned long long)OCFS2_I(dir)->ip_blkno);
100 100
101 status = ocfs2_meta_lock(dir, NULL, NULL, 0); 101 status = ocfs2_meta_lock(dir, NULL, NULL, 0);
102 if (status < 0) { 102 if (status < 0) {
@@ -115,7 +115,8 @@ static struct dentry *ocfs2_get_parent(struct dentry *child)
115 115
116 inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno); 116 inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno);
117 if (IS_ERR(inode)) { 117 if (IS_ERR(inode)) {
118 mlog(ML_ERROR, "Unable to create inode %"MLFu64"\n", blkno); 118 mlog(ML_ERROR, "Unable to create inode %llu\n",
119 (unsigned long long)blkno);
119 parent = ERR_PTR(-EACCES); 120 parent = ERR_PTR(-EACCES);
120 goto bail_unlock; 121 goto bail_unlock;
121 } 122 }
@@ -160,8 +161,8 @@ static int ocfs2_encode_fh(struct dentry *dentry, __be32 *fh, int *max_len,
160 blkno = OCFS2_I(inode)->ip_blkno; 161 blkno = OCFS2_I(inode)->ip_blkno;
161 generation = inode->i_generation; 162 generation = inode->i_generation;
162 163
163 mlog(0, "Encoding fh: blkno: %"MLFu64", generation: %u\n", 164 mlog(0, "Encoding fh: blkno: %llu, generation: %u\n",
164 blkno, generation); 165 (unsigned long long)blkno, generation);
165 166
166 len = 3; 167 len = 3;
167 fh[0] = cpu_to_le32((u32)(blkno >> 32)); 168 fh[0] = cpu_to_le32((u32)(blkno >> 32));
@@ -186,8 +187,8 @@ static int ocfs2_encode_fh(struct dentry *dentry, __be32 *fh, int *max_len,
186 len = 6; 187 len = 6;
187 type = 2; 188 type = 2;
188 189
189 mlog(0, "Encoding parent: blkno: %"MLFu64", generation: %u\n", 190 mlog(0, "Encoding parent: blkno: %llu, generation: %u\n",
190 blkno, generation); 191 (unsigned long long)blkno, generation);
191 } 192 }
192 193
193 *max_len = len; 194 *max_len = len;
@@ -220,16 +221,17 @@ static struct dentry *ocfs2_decode_fh(struct super_block *sb, __be32 *fh,
220 parent.ih_blkno |= (u64)le32_to_cpu(fh[4]); 221 parent.ih_blkno |= (u64)le32_to_cpu(fh[4]);
221 parent.ih_generation = le32_to_cpu(fh[5]); 222 parent.ih_generation = le32_to_cpu(fh[5]);
222 223
223 mlog(0, "Decoding parent: blkno: %"MLFu64", generation: %u\n", 224 mlog(0, "Decoding parent: blkno: %llu, generation: %u\n",
224 parent.ih_blkno, parent.ih_generation); 225 (unsigned long long)parent.ih_blkno,
226 parent.ih_generation);
225 } 227 }
226 228
227 handle.ih_blkno = (u64)le32_to_cpu(fh[0]) << 32; 229 handle.ih_blkno = (u64)le32_to_cpu(fh[0]) << 32;
228 handle.ih_blkno |= (u64)le32_to_cpu(fh[1]); 230 handle.ih_blkno |= (u64)le32_to_cpu(fh[1]);
229 handle.ih_generation = le32_to_cpu(fh[2]); 231 handle.ih_generation = le32_to_cpu(fh[2]);
230 232
231 mlog(0, "Encoding fh: blkno: %"MLFu64", generation: %u\n", 233 mlog(0, "Encoding fh: blkno: %llu, generation: %u\n",
232 handle.ih_blkno, handle.ih_generation); 234 (unsigned long long)handle.ih_blkno, handle.ih_generation);
233 235
234 ret = ocfs2_export_ops.find_exported_dentry(sb, &handle, &parent, 236 ret = ocfs2_export_ops.find_exported_dentry(sb, &handle, &parent,
235 acceptable, context); 237 acceptable, context);
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
index e6f207eebab4..4601fc256f11 100644
--- a/fs/ocfs2/extent_map.c
+++ b/fs/ocfs2/extent_map.c
@@ -182,10 +182,10 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode,
182 if (rec_end > OCFS2_I(inode)->ip_clusters) { 182 if (rec_end > OCFS2_I(inode)->ip_clusters) {
183 mlog_errno(ret); 183 mlog_errno(ret);
184 ocfs2_error(inode->i_sb, 184 ocfs2_error(inode->i_sb,
185 "Extent %d at e_blkno %"MLFu64" of inode %"MLFu64" goes past ip_clusters of %u\n", 185 "Extent %d at e_blkno %llu of inode %llu goes past ip_clusters of %u\n",
186 i, 186 i,
187 le64_to_cpu(rec->e_blkno), 187 (unsigned long long)le64_to_cpu(rec->e_blkno),
188 OCFS2_I(inode)->ip_blkno, 188 (unsigned long long)OCFS2_I(inode)->ip_blkno,
189 OCFS2_I(inode)->ip_clusters); 189 OCFS2_I(inode)->ip_clusters);
190 goto out_free; 190 goto out_free;
191 } 191 }
@@ -233,11 +233,11 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode,
233 if (blkno) { 233 if (blkno) {
234 mlog_errno(ret); 234 mlog_errno(ret);
235 ocfs2_error(inode->i_sb, 235 ocfs2_error(inode->i_sb,
236 "Multiple extents for (cpos = %u, clusters = %u) on inode %"MLFu64"; e_blkno %"MLFu64" and rec %d at e_blkno %"MLFu64"\n", 236 "Multiple extents for (cpos = %u, clusters = %u) on inode %llu; e_blkno %llu and rec %d at e_blkno %llu\n",
237 cpos, clusters, 237 cpos, clusters,
238 OCFS2_I(inode)->ip_blkno, 238 (unsigned long long)OCFS2_I(inode)->ip_blkno,
239 blkno, i, 239 (unsigned long long)blkno, i,
240 le64_to_cpu(rec->e_blkno)); 240 (unsigned long long)le64_to_cpu(rec->e_blkno));
241 goto out_free; 241 goto out_free;
242 } 242 }
243 243
@@ -251,9 +251,9 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode,
251 ret = -EBADR; 251 ret = -EBADR;
252 if (!blkno) { 252 if (!blkno) {
253 ocfs2_error(inode->i_sb, 253 ocfs2_error(inode->i_sb,
254 "No record found for (cpos = %u, clusters = %u) on inode %"MLFu64"\n", 254 "No record found for (cpos = %u, clusters = %u) on inode %llu\n",
255 cpos, clusters, 255 cpos, clusters,
256 OCFS2_I(inode)->ip_blkno); 256 (unsigned long long)OCFS2_I(inode)->ip_blkno);
257 mlog_errno(ret); 257 mlog_errno(ret);
258 goto out_free; 258 goto out_free;
259 } 259 }
@@ -288,10 +288,10 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode,
288 ret = -EBADR; 288 ret = -EBADR;
289 mlog_errno(ret); 289 mlog_errno(ret);
290 ocfs2_error(inode->i_sb, 290 ocfs2_error(inode->i_sb,
291 "Extent %d at e_blkno %"MLFu64" of inode %"MLFu64" goes past ip_clusters of %u\n", 291 "Extent %d at e_blkno %llu of inode %llu goes past ip_clusters of %u\n",
292 i, 292 i,
293 le64_to_cpu(rec->e_blkno), 293 (unsigned long long)le64_to_cpu(rec->e_blkno),
294 OCFS2_I(inode)->ip_blkno, 294 (unsigned long long)OCFS2_I(inode)->ip_blkno,
295 OCFS2_I(inode)->ip_clusters); 295 OCFS2_I(inode)->ip_clusters);
296 return ret; 296 return ret;
297 } 297 }
@@ -557,9 +557,9 @@ static int ocfs2_extent_map_insert(struct inode *inode,
557 ret = -EBADR; 557 ret = -EBADR;
558 mlog_errno(ret); 558 mlog_errno(ret);
559 ocfs2_error(inode->i_sb, 559 ocfs2_error(inode->i_sb,
560 "Zero e_clusters on non-tail extent record at e_blkno %"MLFu64" on inode %"MLFu64"\n", 560 "Zero e_clusters on non-tail extent record at e_blkno %llu on inode %llu\n",
561 le64_to_cpu(rec->e_blkno), 561 (unsigned long long)le64_to_cpu(rec->e_blkno),
562 OCFS2_I(inode)->ip_blkno); 562 (unsigned long long)OCFS2_I(inode)->ip_blkno);
563 return ret; 563 return ret;
564 } 564 }
565 565
@@ -660,10 +660,10 @@ int ocfs2_extent_map_append(struct inode *inode,
660 mlog_bug_on_msg((le32_to_cpu(rec->e_cpos) + 660 mlog_bug_on_msg((le32_to_cpu(rec->e_cpos) +
661 le32_to_cpu(rec->e_clusters)) != 661 le32_to_cpu(rec->e_clusters)) !=
662 (em->em_clusters + new_clusters), 662 (em->em_clusters + new_clusters),
663 "Inode %"MLFu64":\n" 663 "Inode %llu:\n"
664 "rec->e_cpos = %u + rec->e_clusters = %u = %u\n" 664 "rec->e_cpos = %u + rec->e_clusters = %u = %u\n"
665 "em->em_clusters = %u + new_clusters = %u = %u\n", 665 "em->em_clusters = %u + new_clusters = %u = %u\n",
666 OCFS2_I(inode)->ip_blkno, 666 (unsigned long long)OCFS2_I(inode)->ip_blkno,
667 le32_to_cpu(rec->e_cpos), le32_to_cpu(rec->e_clusters), 667 le32_to_cpu(rec->e_cpos), le32_to_cpu(rec->e_clusters),
668 le32_to_cpu(rec->e_cpos) + le32_to_cpu(rec->e_clusters), 668 le32_to_cpu(rec->e_cpos) + le32_to_cpu(rec->e_clusters),
669 em->em_clusters, new_clusters, 669 em->em_clusters, new_clusters,
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 8a4048b55fdc..4b4cbadd5838 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -220,8 +220,9 @@ static int ocfs2_truncate_file(struct inode *inode,
220 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); 220 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
221 struct ocfs2_truncate_context *tc = NULL; 221 struct ocfs2_truncate_context *tc = NULL;
222 222
223 mlog_entry("(inode = %"MLFu64", new_i_size = %"MLFu64"\n", 223 mlog_entry("(inode = %llu, new_i_size = %llu\n",
224 OCFS2_I(inode)->ip_blkno, new_i_size); 224 (unsigned long long)OCFS2_I(inode)->ip_blkno,
225 (unsigned long long)new_i_size);
225 226
226 truncate_inode_pages(inode->i_mapping, new_i_size); 227 truncate_inode_pages(inode->i_mapping, new_i_size);
227 228
@@ -233,23 +234,26 @@ static int ocfs2_truncate_file(struct inode *inode,
233 } 234 }
234 235
235 mlog_bug_on_msg(le64_to_cpu(fe->i_size) != i_size_read(inode), 236 mlog_bug_on_msg(le64_to_cpu(fe->i_size) != i_size_read(inode),
236 "Inode %"MLFu64", inode i_size = %lld != di " 237 "Inode %llu, inode i_size = %lld != di "
237 "i_size = %"MLFu64", i_flags = 0x%x\n", 238 "i_size = %llu, i_flags = 0x%x\n",
238 OCFS2_I(inode)->ip_blkno, 239 (unsigned long long)OCFS2_I(inode)->ip_blkno,
239 i_size_read(inode), 240 i_size_read(inode),
240 le64_to_cpu(fe->i_size), le32_to_cpu(fe->i_flags)); 241 (unsigned long long)le64_to_cpu(fe->i_size),
242 le32_to_cpu(fe->i_flags));
241 243
242 if (new_i_size > le64_to_cpu(fe->i_size)) { 244 if (new_i_size > le64_to_cpu(fe->i_size)) {
243 mlog(0, "asked to truncate file with size (%"MLFu64") " 245 mlog(0, "asked to truncate file with size (%llu) to size (%llu)!\n",
244 "to size (%"MLFu64")!\n", 246 (unsigned long long)le64_to_cpu(fe->i_size),
245 le64_to_cpu(fe->i_size), new_i_size); 247 (unsigned long long)new_i_size);
246 status = -EINVAL; 248 status = -EINVAL;
247 mlog_errno(status); 249 mlog_errno(status);
248 goto bail; 250 goto bail;
249 } 251 }
250 252
251 mlog(0, "inode %"MLFu64", i_size = %"MLFu64", new_i_size = %"MLFu64"\n", 253 mlog(0, "inode %llu, i_size = %llu, new_i_size = %llu\n",
252 le64_to_cpu(fe->i_blkno), le64_to_cpu(fe->i_size), new_i_size); 254 (unsigned long long)le64_to_cpu(fe->i_blkno),
255 (unsigned long long)le64_to_cpu(fe->i_size),
256 (unsigned long long)new_i_size);
253 257
254 /* lets handle the simple truncate cases before doing any more 258 /* lets handle the simple truncate cases before doing any more
255 * cluster locking. */ 259 * cluster locking. */
@@ -378,8 +382,8 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb,
378 } 382 }
379 383
380 block = ocfs2_clusters_to_blocks(osb->sb, bit_off); 384 block = ocfs2_clusters_to_blocks(osb->sb, bit_off);
381 mlog(0, "Allocating %u clusters at block %u for inode %"MLFu64"\n", 385 mlog(0, "Allocating %u clusters at block %u for inode %llu\n",
382 num_bits, bit_off, OCFS2_I(inode)->ip_blkno); 386 num_bits, bit_off, (unsigned long long)OCFS2_I(inode)->ip_blkno);
383 status = ocfs2_insert_extent(osb, handle, inode, fe_bh, block, 387 status = ocfs2_insert_extent(osb, handle, inode, fe_bh, block,
384 num_bits, meta_ac); 388 num_bits, meta_ac);
385 if (status < 0) { 389 if (status < 0) {
@@ -449,9 +453,9 @@ static int ocfs2_extend_allocation(struct inode *inode,
449restart_all: 453restart_all:
450 BUG_ON(le32_to_cpu(fe->i_clusters) != OCFS2_I(inode)->ip_clusters); 454 BUG_ON(le32_to_cpu(fe->i_clusters) != OCFS2_I(inode)->ip_clusters);
451 455
452 mlog(0, "extend inode %"MLFu64", i_size = %lld, fe->i_clusters = %u, " 456 mlog(0, "extend inode %llu, i_size = %lld, fe->i_clusters = %u, "
453 "clusters_to_add = %u\n", 457 "clusters_to_add = %u\n",
454 OCFS2_I(inode)->ip_blkno, i_size_read(inode), 458 (unsigned long long)OCFS2_I(inode)->ip_blkno, i_size_read(inode),
455 fe->i_clusters, clusters_to_add); 459 fe->i_clusters, clusters_to_add);
456 460
457 handle = ocfs2_alloc_handle(osb); 461 handle = ocfs2_alloc_handle(osb);
@@ -569,8 +573,8 @@ restarted_transaction:
569 } 573 }
570 } 574 }
571 575
572 mlog(0, "fe: i_clusters = %u, i_size=%"MLFu64"\n", 576 mlog(0, "fe: i_clusters = %u, i_size=%llu\n",
573 fe->i_clusters, fe->i_size); 577 fe->i_clusters, (unsigned long long)fe->i_size);
574 mlog(0, "inode: ip_clusters=%u, i_size=%lld\n", 578 mlog(0, "inode: ip_clusters=%u, i_size=%lld\n",
575 OCFS2_I(inode)->ip_clusters, i_size_read(inode)); 579 OCFS2_I(inode)->ip_clusters, i_size_read(inode));
576 580
@@ -865,8 +869,8 @@ static int ocfs2_write_remove_suid(struct inode *inode)
865 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); 869 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
866 struct ocfs2_dinode *di; 870 struct ocfs2_dinode *di;
867 871
868 mlog_entry("(Inode %"MLFu64", mode 0%o)\n", oi->ip_blkno, 872 mlog_entry("(Inode %llu, mode 0%o)\n",
869 inode->i_mode); 873 (unsigned long long)oi->ip_blkno, inode->i_mode);
870 874
871 handle = ocfs2_start_trans(osb, NULL, OCFS2_INODE_UPDATE_CREDITS); 875 handle = ocfs2_start_trans(osb, NULL, OCFS2_INODE_UPDATE_CREDITS);
872 if (handle == NULL) { 876 if (handle == NULL) {
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 315472a5c192..327a5b7b86ed 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -95,7 +95,7 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno)
95 struct super_block *sb = osb->sb; 95 struct super_block *sb = osb->sb;
96 struct ocfs2_find_inode_args args; 96 struct ocfs2_find_inode_args args;
97 97
98 mlog_entry("(blkno = %"MLFu64")\n", blkno); 98 mlog_entry("(blkno = %llu)\n", (unsigned long long)blkno);
99 99
100 /* Ok. By now we've either got the offsets passed to us by the 100 /* Ok. By now we've either got the offsets passed to us by the
101 * caller, or we just pulled them off the bh. Lets do some 101 * caller, or we just pulled them off the bh. Lets do some
@@ -134,8 +134,8 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno)
134 134
135bail: 135bail:
136 if (!IS_ERR(inode)) { 136 if (!IS_ERR(inode)) {
137 mlog(0, "returning inode with number %"MLFu64"\n", 137 mlog(0, "returning inode with number %llu\n",
138 OCFS2_I(inode)->ip_blkno); 138 (unsigned long long)OCFS2_I(inode)->ip_blkno);
139 mlog_exit_ptr(inode); 139 mlog_exit_ptr(inode);
140 } else 140 } else
141 mlog_errno(PTR_ERR(inode)); 141 mlog_errno(PTR_ERR(inode));
@@ -219,7 +219,8 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
219 struct ocfs2_super *osb; 219 struct ocfs2_super *osb;
220 int status = -EINVAL; 220 int status = -EINVAL;
221 221
222 mlog_entry("(0x%p, size:%"MLFu64")\n", inode, fe->i_size); 222 mlog_entry("(0x%p, size:%llu)\n", inode,
223 (unsigned long long)fe->i_size);
223 224
224 sb = inode->i_sb; 225 sb = inode->i_sb;
225 osb = OCFS2_SB(sb); 226 osb = OCFS2_SB(sb);
@@ -228,9 +229,10 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
228 * today. change if needed. */ 229 * today. change if needed. */
229 if (!OCFS2_IS_VALID_DINODE(fe) || 230 if (!OCFS2_IS_VALID_DINODE(fe) ||
230 !(fe->i_flags & cpu_to_le32(OCFS2_VALID_FL))) { 231 !(fe->i_flags & cpu_to_le32(OCFS2_VALID_FL))) {
231 mlog(ML_ERROR, "Invalid dinode: i_ino=%lu, i_blkno=%"MLFu64", " 232 mlog(ML_ERROR, "Invalid dinode: i_ino=%lu, i_blkno=%llu, "
232 "signature = %.*s, flags = 0x%x\n", 233 "signature = %.*s, flags = 0x%x\n",
233 inode->i_ino, le64_to_cpu(fe->i_blkno), 7, 234 inode->i_ino,
235 (unsigned long long)le64_to_cpu(fe->i_blkno), 7,
234 fe->i_signature, le32_to_cpu(fe->i_flags)); 236 fe->i_signature, le32_to_cpu(fe->i_flags));
235 goto bail; 237 goto bail;
236 } 238 }
@@ -268,8 +270,9 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
268 270
269 if (OCFS2_I(inode)->ip_blkno != le64_to_cpu(fe->i_blkno)) 271 if (OCFS2_I(inode)->ip_blkno != le64_to_cpu(fe->i_blkno))
270 mlog(ML_ERROR, 272 mlog(ML_ERROR,
271 "ip_blkno %"MLFu64" != i_blkno %"MLFu64"!\n", 273 "ip_blkno %llu != i_blkno %llu!\n",
272 OCFS2_I(inode)->ip_blkno, fe->i_blkno); 274 (unsigned long long)OCFS2_I(inode)->ip_blkno,
275 (unsigned long long)fe->i_blkno);
273 276
274 OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters); 277 OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters);
275 OCFS2_I(inode)->ip_orphaned_slot = OCFS2_INVALID_SLOT; 278 OCFS2_I(inode)->ip_orphaned_slot = OCFS2_INVALID_SLOT;
@@ -278,8 +281,8 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
278 inode->i_ino = ino_from_blkno(inode->i_sb, 281 inode->i_ino = ino_from_blkno(inode->i_sb,
279 le64_to_cpu(fe->i_blkno)); 282 le64_to_cpu(fe->i_blkno));
280 283
281 mlog(0, "blkno = %"MLFu64", ino = %lu, create_ino = %s\n", 284 mlog(0, "blkno = %llu, ino = %lu, create_ino = %s\n",
282 fe->i_blkno, inode->i_ino, create_ino ? "true" : "false"); 285 (unsigned long long)fe->i_blkno, inode->i_ino, create_ino ? "true" : "false");
283 286
284 inode->i_nlink = le16_to_cpu(fe->i_links_count); 287 inode->i_nlink = le16_to_cpu(fe->i_links_count);
285 288
@@ -371,8 +374,8 @@ static int ocfs2_read_locked_inode(struct inode *inode,
371 374
372 fe = (struct ocfs2_dinode *) bh->b_data; 375 fe = (struct ocfs2_dinode *) bh->b_data;
373 if (!OCFS2_IS_VALID_DINODE(fe)) { 376 if (!OCFS2_IS_VALID_DINODE(fe)) {
374 mlog(ML_ERROR, "Invalid dinode #%"MLFu64": signature = %.*s\n", 377 mlog(ML_ERROR, "Invalid dinode #%llu: signature = %.*s\n",
375 fe->i_blkno, 7, fe->i_signature); 378 (unsigned long long)fe->i_blkno, 7, fe->i_signature);
376 make_bad_inode(inode); 379 make_bad_inode(inode);
377 goto bail; 380 goto bail;
378 } 381 }
@@ -386,8 +389,8 @@ static int ocfs2_read_locked_inode(struct inode *inode,
386 389
387 status = -EINVAL; 390 status = -EINVAL;
388 if (ocfs2_populate_inode(inode, fe, 0) < 0) { 391 if (ocfs2_populate_inode(inode, fe, 0) < 0) {
389 mlog(ML_ERROR, "populate inode failed! i_blkno=%"MLFu64", " 392 mlog(ML_ERROR, "populate failed! i_blkno=%llu, i_ino=%lu\n",
390 "i_ino=%lu\n", fe->i_blkno, inode->i_ino); 393 (unsigned long long)fe->i_blkno, inode->i_ino);
391 make_bad_inode(inode); 394 make_bad_inode(inode);
392 goto bail; 395 goto bail;
393 } 396 }
@@ -675,8 +678,8 @@ static int ocfs2_inode_is_valid_to_delete(struct inode *inode)
675 * never get here as system file inodes should always have a 678 * never get here as system file inodes should always have a
676 * positive link count. */ 679 * positive link count. */
677 if (oi->ip_flags & OCFS2_INODE_SYSTEM_FILE) { 680 if (oi->ip_flags & OCFS2_INODE_SYSTEM_FILE) {
678 mlog(ML_ERROR, "Skipping delete of system file %"MLFu64".\n", 681 mlog(ML_ERROR, "Skipping delete of system file %llu\n",
679 oi->ip_blkno); 682 (unsigned long long)oi->ip_blkno);
680 goto bail_unlock; 683 goto bail_unlock;
681 } 684 }
682 685
@@ -715,16 +718,16 @@ static int ocfs2_query_inode_wipe(struct inode *inode,
715 * ocfs2_delete_inode, another node might have asked to delete 718 * ocfs2_delete_inode, another node might have asked to delete
716 * the inode. Recheck our flags to catch this. */ 719 * the inode. Recheck our flags to catch this. */
717 if (!ocfs2_inode_is_valid_to_delete(inode)) { 720 if (!ocfs2_inode_is_valid_to_delete(inode)) {
718 mlog(0, "Skipping delete of %"MLFu64" because flags changed\n", 721 mlog(0, "Skipping delete of %llu because flags changed\n",
719 oi->ip_blkno); 722 (unsigned long long)oi->ip_blkno);
720 goto bail; 723 goto bail;
721 } 724 }
722 725
723 /* Now that we have an up to date inode, we can double check 726 /* Now that we have an up to date inode, we can double check
724 * the link count. */ 727 * the link count. */
725 if (inode->i_nlink) { 728 if (inode->i_nlink) {
726 mlog(0, "Skipping delete of %"MLFu64" because nlink = %u\n", 729 mlog(0, "Skipping delete of %llu because nlink = %u\n",
727 oi->ip_blkno, inode->i_nlink); 730 (unsigned long long)oi->ip_blkno, inode->i_nlink);
728 goto bail; 731 goto bail;
729 } 732 }
730 733
@@ -734,9 +737,11 @@ static int ocfs2_query_inode_wipe(struct inode *inode,
734 /* for lack of a better error? */ 737 /* for lack of a better error? */
735 status = -EEXIST; 738 status = -EEXIST;
736 mlog(ML_ERROR, 739 mlog(ML_ERROR,
737 "Inode %"MLFu64" (on-disk %"MLFu64") not orphaned! " 740 "Inode %llu (on-disk %llu) not orphaned! "
738 "Disk flags 0x%x, inode flags 0x%x\n", 741 "Disk flags 0x%x, inode flags 0x%x\n",
739 oi->ip_blkno, di->i_blkno, di->i_flags, oi->ip_flags); 742 (unsigned long long)oi->ip_blkno,
743 (unsigned long long)di->i_blkno, di->i_flags,
744 oi->ip_flags);
740 goto bail; 745 goto bail;
741 } 746 }
742 747
@@ -753,8 +758,8 @@ static int ocfs2_query_inode_wipe(struct inode *inode,
753 * disk and let them worry about deleting it. */ 758 * disk and let them worry about deleting it. */
754 if (status == -EBUSY) { 759 if (status == -EBUSY) {
755 status = 0; 760 status = 0;
756 mlog(0, "Skipping delete of %"MLFu64" because it is in use on" 761 mlog(0, "Skipping delete of %llu because it is in use on"
757 "other nodes\n", oi->ip_blkno); 762 "other nodes\n", (unsigned long long)oi->ip_blkno);
758 goto bail; 763 goto bail;
759 } 764 }
760 if (status < 0) { 765 if (status < 0) {
@@ -768,13 +773,13 @@ static int ocfs2_query_inode_wipe(struct inode *inode,
768 * into. This may happen during node death and 773 * into. This may happen during node death and
769 * recovery knows how to clean it up so we can safely 774 * recovery knows how to clean it up so we can safely
770 * ignore this inode for now on. */ 775 * ignore this inode for now on. */
771 mlog(0, "Nobody knew where inode %"MLFu64" was orphaned!\n", 776 mlog(0, "Nobody knew where inode %llu was orphaned!\n",
772 oi->ip_blkno); 777 (unsigned long long)oi->ip_blkno);
773 } else { 778 } else {
774 *wipe = 1; 779 *wipe = 1;
775 780
776 mlog(0, "Inode %"MLFu64" is ok to wipe from orphan dir %d\n", 781 mlog(0, "Inode %llu is ok to wipe from orphan dir %d\n",
777 oi->ip_blkno, oi->ip_orphaned_slot); 782 (unsigned long long)oi->ip_blkno, oi->ip_orphaned_slot);
778 } 783 }
779 spin_unlock(&oi->ip_lock); 784 spin_unlock(&oi->ip_lock);
780 785
@@ -788,8 +793,8 @@ bail:
788static void ocfs2_cleanup_delete_inode(struct inode *inode, 793static void ocfs2_cleanup_delete_inode(struct inode *inode,
789 int sync_data) 794 int sync_data)
790{ 795{
791 mlog(0, "Cleanup inode %"MLFu64", sync = %d\n", 796 mlog(0, "Cleanup inode %llu, sync = %d\n",
792 OCFS2_I(inode)->ip_blkno, sync_data); 797 (unsigned long long)OCFS2_I(inode)->ip_blkno, sync_data);
793 if (sync_data) 798 if (sync_data)
794 write_inode_now(inode, 1); 799 write_inode_now(inode, 1);
795 truncate_inode_pages(&inode->i_data, 0); 800 truncate_inode_pages(&inode->i_data, 0);
@@ -897,8 +902,8 @@ void ocfs2_clear_inode(struct inode *inode)
897 if (!inode) 902 if (!inode)
898 goto bail; 903 goto bail;
899 904
900 mlog(0, "Clearing inode: %"MLFu64", nlink = %u\n", 905 mlog(0, "Clearing inode: %llu, nlink = %u\n",
901 OCFS2_I(inode)->ip_blkno, inode->i_nlink); 906 (unsigned long long)OCFS2_I(inode)->ip_blkno, inode->i_nlink);
902 907
903 mlog_bug_on_msg(OCFS2_SB(inode->i_sb) == NULL, 908 mlog_bug_on_msg(OCFS2_SB(inode->i_sb) == NULL,
904 "Inode=%lu\n", inode->i_ino); 909 "Inode=%lu\n", inode->i_ino);
@@ -919,8 +924,8 @@ void ocfs2_clear_inode(struct inode *inode)
919 ocfs2_checkpoint_inode(inode); 924 ocfs2_checkpoint_inode(inode);
920 925
921 mlog_bug_on_msg(!list_empty(&oi->ip_io_markers), 926 mlog_bug_on_msg(!list_empty(&oi->ip_io_markers),
922 "Clear inode of %"MLFu64", inode has io markers\n", 927 "Clear inode of %llu, inode has io markers\n",
923 oi->ip_blkno); 928 (unsigned long long)oi->ip_blkno);
924 929
925 ocfs2_extent_map_drop(inode, 0); 930 ocfs2_extent_map_drop(inode, 0);
926 ocfs2_extent_map_init(inode); 931 ocfs2_extent_map_init(inode);
@@ -936,20 +941,20 @@ void ocfs2_clear_inode(struct inode *inode)
936 ocfs2_metadata_cache_purge(inode); 941 ocfs2_metadata_cache_purge(inode);
937 942
938 mlog_bug_on_msg(oi->ip_metadata_cache.ci_num_cached, 943 mlog_bug_on_msg(oi->ip_metadata_cache.ci_num_cached,
939 "Clear inode of %"MLFu64", inode has %u cache items\n", 944 "Clear inode of %llu, inode has %u cache items\n",
940 oi->ip_blkno, oi->ip_metadata_cache.ci_num_cached); 945 (unsigned long long)oi->ip_blkno, oi->ip_metadata_cache.ci_num_cached);
941 946
942 mlog_bug_on_msg(!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE), 947 mlog_bug_on_msg(!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE),
943 "Clear inode of %"MLFu64", inode has a bad flag\n", 948 "Clear inode of %llu, inode has a bad flag\n",
944 oi->ip_blkno); 949 (unsigned long long)oi->ip_blkno);
945 950
946 mlog_bug_on_msg(spin_is_locked(&oi->ip_lock), 951 mlog_bug_on_msg(spin_is_locked(&oi->ip_lock),
947 "Clear inode of %"MLFu64", inode is locked\n", 952 "Clear inode of %llu, inode is locked\n",
948 oi->ip_blkno); 953 (unsigned long long)oi->ip_blkno);
949 954
950 mlog_bug_on_msg(!mutex_trylock(&oi->ip_io_mutex), 955 mlog_bug_on_msg(!mutex_trylock(&oi->ip_io_mutex),
951 "Clear inode of %"MLFu64", io_mutex is locked\n", 956 "Clear inode of %llu, io_mutex is locked\n",
952 oi->ip_blkno); 957 (unsigned long long)oi->ip_blkno);
953 mutex_unlock(&oi->ip_io_mutex); 958 mutex_unlock(&oi->ip_io_mutex);
954 959
955 /* 960 /*
@@ -957,19 +962,19 @@ void ocfs2_clear_inode(struct inode *inode)
957 * kernel 1, world 0 962 * kernel 1, world 0
958 */ 963 */
959 mlog_bug_on_msg(!down_write_trylock(&oi->ip_alloc_sem), 964 mlog_bug_on_msg(!down_write_trylock(&oi->ip_alloc_sem),
960 "Clear inode of %"MLFu64", alloc_sem is locked\n", 965 "Clear inode of %llu, alloc_sem is locked\n",
961 oi->ip_blkno); 966 (unsigned long long)oi->ip_blkno);
962 up_write(&oi->ip_alloc_sem); 967 up_write(&oi->ip_alloc_sem);
963 968
964 mlog_bug_on_msg(oi->ip_open_count, 969 mlog_bug_on_msg(oi->ip_open_count,
965 "Clear inode of %"MLFu64" has open count %d\n", 970 "Clear inode of %llu has open count %d\n",
966 oi->ip_blkno, oi->ip_open_count); 971 (unsigned long long)oi->ip_blkno, oi->ip_open_count);
967 mlog_bug_on_msg(!list_empty(&oi->ip_handle_list), 972 mlog_bug_on_msg(!list_empty(&oi->ip_handle_list),
968 "Clear inode of %"MLFu64" has non empty handle list\n", 973 "Clear inode of %llu has non empty handle list\n",
969 oi->ip_blkno); 974 (unsigned long long)oi->ip_blkno);
970 mlog_bug_on_msg(oi->ip_handle, 975 mlog_bug_on_msg(oi->ip_handle,
971 "Clear inode of %"MLFu64" has non empty handle pointer\n", 976 "Clear inode of %llu has non empty handle pointer\n",
972 oi->ip_blkno); 977 (unsigned long long)oi->ip_blkno);
973 978
974 /* Clear all other flags. */ 979 /* Clear all other flags. */
975 oi->ip_flags = OCFS2_INODE_CACHE_INLINE; 980 oi->ip_flags = OCFS2_INODE_CACHE_INLINE;
@@ -991,8 +996,8 @@ void ocfs2_drop_inode(struct inode *inode)
991 996
992 mlog_entry_void(); 997 mlog_entry_void();
993 998
994 mlog(0, "Drop inode %"MLFu64", nlink = %u, ip_flags = 0x%x\n", 999 mlog(0, "Drop inode %llu, nlink = %u, ip_flags = 0x%x\n",
995 oi->ip_blkno, inode->i_nlink, oi->ip_flags); 1000 (unsigned long long)oi->ip_blkno, inode->i_nlink, oi->ip_flags);
996 1001
997 /* Testing ip_orphaned_slot here wouldn't work because we may 1002 /* Testing ip_orphaned_slot here wouldn't work because we may
998 * not have gotten a delete_inode vote from any other nodes 1003 * not have gotten a delete_inode vote from any other nodes
@@ -1069,8 +1074,8 @@ int ocfs2_inode_revalidate(struct dentry *dentry)
1069 struct inode *inode = dentry->d_inode; 1074 struct inode *inode = dentry->d_inode;
1070 int status = 0; 1075 int status = 0;
1071 1076
1072 mlog_entry("(inode = 0x%p, ino = %"MLFu64")\n", inode, 1077 mlog_entry("(inode = 0x%p, ino = %llu)\n", inode,
1073 inode ? OCFS2_I(inode)->ip_blkno : 0ULL); 1078 inode ? (unsigned long long)OCFS2_I(inode)->ip_blkno : 0ULL);
1074 1079
1075 if (!inode) { 1080 if (!inode) {
1076 mlog(0, "eep, no inode!\n"); 1081 mlog(0, "eep, no inode!\n");
@@ -1114,7 +1119,8 @@ int ocfs2_mark_inode_dirty(struct ocfs2_journal_handle *handle,
1114 int status; 1119 int status;
1115 struct ocfs2_dinode *fe = (struct ocfs2_dinode *) bh->b_data; 1120 struct ocfs2_dinode *fe = (struct ocfs2_dinode *) bh->b_data;
1116 1121
1117 mlog_entry("(inode %"MLFu64")\n", OCFS2_I(inode)->ip_blkno); 1122 mlog_entry("(inode %llu)\n",
1123 (unsigned long long)OCFS2_I(inode)->ip_blkno);
1118 1124
1119 status = ocfs2_journal_access(handle, inode, bh, 1125 status = ocfs2_journal_access(handle, inode, bh,
1120 OCFS2_JOURNAL_ACCESS_WRITE); 1126 OCFS2_JOURNAL_ACCESS_WRITE);
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 4be801f4559b..ae3440ca083c 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -503,8 +503,8 @@ static void ocfs2_handle_cleanup_locks(struct ocfs2_journal *journal,
503 ocfs2_meta_unlock(inode, 1); 503 ocfs2_meta_unlock(inode, 1);
504 if (atomic_read(&inode->i_count) == 1) 504 if (atomic_read(&inode->i_count) == 1)
505 mlog(ML_ERROR, 505 mlog(ML_ERROR,
506 "Inode %"MLFu64", I'm doing a last iput for!", 506 "Inode %llu, I'm doing a last iput for!",
507 OCFS2_I(inode)->ip_blkno); 507 (unsigned long long)OCFS2_I(inode)->ip_blkno);
508 iput(inode); 508 iput(inode);
509 kmem_cache_free(ocfs2_lock_cache, lock); 509 kmem_cache_free(ocfs2_lock_cache, lock);
510 } 510 }
@@ -640,8 +640,9 @@ static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb,
640 /* This is called from startup/shutdown which will 640 /* This is called from startup/shutdown which will
641 * handle the errors in a specific manner, so no need 641 * handle the errors in a specific manner, so no need
642 * to call ocfs2_error() here. */ 642 * to call ocfs2_error() here. */
643 mlog(ML_ERROR, "Journal dinode %"MLFu64" has invalid " 643 mlog(ML_ERROR, "Journal dinode %llu has invalid "
644 "signature: %.*s", fe->i_blkno, 7, fe->i_signature); 644 "signature: %.*s", (unsigned long long)fe->i_blkno, 7,
645 fe->i_signature);
645 status = -EIO; 646 status = -EIO;
646 goto out; 647 goto out;
647 } 648 }
@@ -934,8 +935,8 @@ void ocfs2_complete_recovery(void *data)
934 935
935 la_dinode = item->lri_la_dinode; 936 la_dinode = item->lri_la_dinode;
936 if (la_dinode) { 937 if (la_dinode) {
937 mlog(0, "Clean up local alloc %"MLFu64"\n", 938 mlog(0, "Clean up local alloc %llu\n",
938 la_dinode->i_blkno); 939 (unsigned long long)la_dinode->i_blkno);
939 940
940 ret = ocfs2_complete_local_alloc_recovery(osb, 941 ret = ocfs2_complete_local_alloc_recovery(osb,
941 la_dinode); 942 la_dinode);
@@ -947,8 +948,8 @@ void ocfs2_complete_recovery(void *data)
947 948
948 tl_dinode = item->lri_tl_dinode; 949 tl_dinode = item->lri_tl_dinode;
949 if (tl_dinode) { 950 if (tl_dinode) {
950 mlog(0, "Clean up truncate log %"MLFu64"\n", 951 mlog(0, "Clean up truncate log %llu\n",
951 tl_dinode->i_blkno); 952 (unsigned long long)tl_dinode->i_blkno);
952 953
953 ret = ocfs2_complete_truncate_log_recovery(osb, 954 ret = ocfs2_complete_truncate_log_recovery(osb,
954 tl_dinode); 955 tl_dinode);
@@ -1473,11 +1474,11 @@ static int ocfs2_queue_orphans(struct ocfs2_super *osb,
1473 if (de->file_type > OCFS2_FT_MAX) { 1474 if (de->file_type > OCFS2_FT_MAX) {
1474 mlog(ML_ERROR, 1475 mlog(ML_ERROR,
1475 "block %llu contains invalid de: " 1476 "block %llu contains invalid de: "
1476 "inode = %"MLFu64", rec_len = %u, " 1477 "inode = %llu, rec_len = %u, "
1477 "name_len = %u, file_type = %u, " 1478 "name_len = %u, file_type = %u, "
1478 "name='%.*s'\n", 1479 "name='%.*s'\n",
1479 (unsigned long long)bh->b_blocknr, 1480 (unsigned long long)bh->b_blocknr,
1480 le64_to_cpu(de->inode), 1481 (unsigned long long)le64_to_cpu(de->inode),
1481 le16_to_cpu(de->rec_len), 1482 le16_to_cpu(de->rec_len),
1482 de->name_len, 1483 de->name_len,
1483 de->file_type, 1484 de->file_type,
@@ -1494,8 +1495,8 @@ static int ocfs2_queue_orphans(struct ocfs2_super *osb,
1494 if (IS_ERR(iter)) 1495 if (IS_ERR(iter))
1495 continue; 1496 continue;
1496 1497
1497 mlog(0, "queue orphan %"MLFu64"\n", 1498 mlog(0, "queue orphan %llu\n",
1498 OCFS2_I(iter)->ip_blkno); 1499 (unsigned long long)OCFS2_I(iter)->ip_blkno);
1499 /* No locking is required for the next_orphan 1500 /* No locking is required for the next_orphan
1500 * queue as there is only ever a single 1501 * queue as there is only ever a single
1501 * process doing orphan recovery. */ 1502 * process doing orphan recovery. */
@@ -1588,7 +1589,7 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb,
1588 1589
1589 while (inode) { 1590 while (inode) {
1590 oi = OCFS2_I(inode); 1591 oi = OCFS2_I(inode);
1591 mlog(0, "iput orphan %"MLFu64"\n", oi->ip_blkno); 1592 mlog(0, "iput orphan %llu\n", (unsigned long long)oi->ip_blkno);
1592 1593
1593 iter = oi->ip_next_orphan; 1594 iter = oi->ip_next_orphan;
1594 1595
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index 149b35181666..0d1973ea32b0 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -143,8 +143,8 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb)
143 143
144 if (!(le32_to_cpu(alloc->i_flags) & 144 if (!(le32_to_cpu(alloc->i_flags) &
145 (OCFS2_LOCAL_ALLOC_FL|OCFS2_BITMAP_FL))) { 145 (OCFS2_LOCAL_ALLOC_FL|OCFS2_BITMAP_FL))) {
146 mlog(ML_ERROR, "Invalid local alloc inode, %"MLFu64"\n", 146 mlog(ML_ERROR, "Invalid local alloc inode, %llu\n",
147 OCFS2_I(inode)->ip_blkno); 147 (unsigned long long)OCFS2_I(inode)->ip_blkno);
148 status = -EINVAL; 148 status = -EINVAL;
149 goto bail; 149 goto bail;
150 } 150 }
@@ -493,9 +493,9 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
493 493
494 if (le32_to_cpu(alloc->id1.bitmap1.i_used) != 494 if (le32_to_cpu(alloc->id1.bitmap1.i_used) !=
495 ocfs2_local_alloc_count_bits(alloc)) { 495 ocfs2_local_alloc_count_bits(alloc)) {
496 ocfs2_error(osb->sb, "local alloc inode %"MLFu64" says it has " 496 ocfs2_error(osb->sb, "local alloc inode %llu says it has "
497 "%u free bits, but a count shows %u", 497 "%u free bits, but a count shows %u",
498 le64_to_cpu(alloc->i_blkno), 498 (unsigned long long)le64_to_cpu(alloc->i_blkno),
499 le32_to_cpu(alloc->id1.bitmap1.i_used), 499 le32_to_cpu(alloc->id1.bitmap1.i_used),
500 ocfs2_local_alloc_count_bits(alloc)); 500 ocfs2_local_alloc_count_bits(alloc));
501 status = -EIO; 501 status = -EIO;
@@ -753,10 +753,11 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb,
753 ocfs2_clusters_to_blocks(osb->sb, 753 ocfs2_clusters_to_blocks(osb->sb,
754 start - count); 754 start - count);
755 755
756 mlog(0, "freeing %u bits starting at local " 756 mlog(0, "freeing %u bits starting at local alloc bit "
757 "alloc bit %u (la_start_blk = %"MLFu64", " 757 "%u (la_start_blk = %llu, blkno = %llu)\n",
758 "blkno = %"MLFu64")\n", count, start - count, 758 count, start - count,
759 la_start_blk, blkno); 759 (unsigned long long)la_start_blk,
760 (unsigned long long)blkno);
760 761
761 status = ocfs2_free_clusters(handle, main_bm_inode, 762 status = ocfs2_free_clusters(handle, main_bm_inode,
762 main_bm_bh, blkno, count); 763 main_bm_bh, blkno, count);
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index f6b77ff1d2bf..274f61d0cda9 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -161,8 +161,8 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,
161 goto bail; 161 goto bail;
162 } 162 }
163 163
164 mlog(0, "find name %.*s in directory %"MLFu64"\n", dentry->d_name.len, 164 mlog(0, "find name %.*s in directory %llu\n", dentry->d_name.len,
165 dentry->d_name.name, OCFS2_I(dir)->ip_blkno); 165 dentry->d_name.name, (unsigned long long)OCFS2_I(dir)->ip_blkno);
166 166
167 status = ocfs2_meta_lock(dir, NULL, NULL, 0); 167 status = ocfs2_meta_lock(dir, NULL, NULL, 0);
168 if (status < 0) { 168 if (status < 0) {
@@ -180,7 +180,8 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,
180 180
181 inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno); 181 inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno);
182 if (IS_ERR(inode)) { 182 if (IS_ERR(inode)) {
183 mlog(ML_ERROR, "Unable to create inode %"MLFu64"\n", blkno); 183 mlog(ML_ERROR, "Unable to create inode %llu\n",
184 (unsigned long long)blkno);
184 ret = ERR_PTR(-EACCES); 185 ret = ERR_PTR(-EACCES);
185 goto bail_unlock; 186 goto bail_unlock;
186 } 187 }
@@ -310,8 +311,8 @@ static int ocfs2_mknod(struct inode *dir,
310 osb = OCFS2_SB(dir->i_sb); 311 osb = OCFS2_SB(dir->i_sb);
311 312
312 if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) { 313 if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) {
313 mlog(ML_ERROR, "inode %"MLFu64" has i_nlink of %u\n", 314 mlog(ML_ERROR, "inode %llu has i_nlink of %u\n",
314 OCFS2_I(dir)->ip_blkno, dir->i_nlink); 315 (unsigned long long)OCFS2_I(dir)->ip_blkno, dir->i_nlink);
315 status = -EMLINK; 316 status = -EMLINK;
316 goto leave; 317 goto leave;
317 } 318 }
@@ -562,9 +563,9 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
562 563
563 if (ocfs2_populate_inode(inode, fe, 1) < 0) { 564 if (ocfs2_populate_inode(inode, fe, 1) < 0) {
564 mlog(ML_ERROR, "populate inode failed! bh->b_blocknr=%llu, " 565 mlog(ML_ERROR, "populate inode failed! bh->b_blocknr=%llu, "
565 "i_blkno=%"MLFu64", i_ino=%lu\n", 566 "i_blkno=%llu, i_ino=%lu\n",
566 (unsigned long long) (*new_fe_bh)->b_blocknr, 567 (unsigned long long) (*new_fe_bh)->b_blocknr,
567 fe->i_blkno, inode->i_ino); 568 (unsigned long long)fe->i_blkno, inode->i_ino);
568 BUG(); 569 BUG();
569 } 570 }
570 571
@@ -765,7 +766,7 @@ static int ocfs2_unlink(struct inode *dir,
765 766
766 BUG_ON(dentry->d_parent->d_inode != dir); 767 BUG_ON(dentry->d_parent->d_inode != dir);
767 768
768 mlog(0, "ino = %"MLFu64"\n", OCFS2_I(inode)->ip_blkno); 769 mlog(0, "ino = %llu\n", (unsigned long long)OCFS2_I(inode)->ip_blkno);
769 770
770 if (inode == osb->root_inode) { 771 if (inode == osb->root_inode) {
771 mlog(0, "Cannot delete the root directory\n"); 772 mlog(0, "Cannot delete the root directory\n");
@@ -799,9 +800,9 @@ static int ocfs2_unlink(struct inode *dir,
799 if (OCFS2_I(inode)->ip_blkno != blkno) { 800 if (OCFS2_I(inode)->ip_blkno != blkno) {
800 status = -ENOENT; 801 status = -ENOENT;
801 802
802 mlog(0, "ip_blkno (%"MLFu64") != dirent blkno (%"MLFu64") " 803 mlog(0, "ip_blkno %llu != dirent blkno %llu ip_flags = %x\n",
803 "ip_flags = %x\n", OCFS2_I(inode)->ip_blkno, blkno, 804 (unsigned long long)OCFS2_I(inode)->ip_blkno,
804 OCFS2_I(inode)->ip_flags); 805 (unsigned long long)blkno, OCFS2_I(inode)->ip_flags);
805 goto leave; 806 goto leave;
806 } 807 }
807 808
@@ -946,8 +947,9 @@ static int ocfs2_double_lock(struct ocfs2_super *osb,
946 struct buffer_head **tmpbh; 947 struct buffer_head **tmpbh;
947 struct inode *tmpinode; 948 struct inode *tmpinode;
948 949
949 mlog_entry("(inode1 = %"MLFu64", inode2 = %"MLFu64")\n", 950 mlog_entry("(inode1 = %llu, inode2 = %llu)\n",
950 oi1->ip_blkno, oi2->ip_blkno); 951 (unsigned long long)oi1->ip_blkno,
952 (unsigned long long)oi2->ip_blkno);
951 953
952 BUG_ON(!handle); 954 BUG_ON(!handle);
953 955
@@ -1187,9 +1189,9 @@ static int ocfs2_rename(struct inode *old_dir,
1187 if (OCFS2_I(new_inode)->ip_blkno != newfe_blkno) { 1189 if (OCFS2_I(new_inode)->ip_blkno != newfe_blkno) {
1188 status = -EACCES; 1190 status = -EACCES;
1189 1191
1190 mlog(0, "Inode blkno (%"MLFu64") and dir (%"MLFu64") " 1192 mlog(0, "Inode %llu and dir %llu disagree. flags = %x\n",
1191 "disagree. ip_flags = %x\n", 1193 (unsigned long long)OCFS2_I(new_inode)->ip_blkno,
1192 OCFS2_I(new_inode)->ip_blkno, newfe_blkno, 1194 (unsigned long long)newfe_blkno,
1193 OCFS2_I(new_inode)->ip_flags); 1195 OCFS2_I(new_inode)->ip_flags);
1194 goto bail; 1196 goto bail;
1195 } 1197 }
@@ -1215,9 +1217,9 @@ static int ocfs2_rename(struct inode *old_dir,
1215 1217
1216 newfe = (struct ocfs2_dinode *) newfe_bh->b_data; 1218 newfe = (struct ocfs2_dinode *) newfe_bh->b_data;
1217 1219
1218 mlog(0, "aha rename over existing... new_de=%p " 1220 mlog(0, "aha rename over existing... new_de=%p new_blkno=%llu "
1219 "new_blkno=%"MLFu64" newfebh=%p bhblocknr=%llu\n", 1221 "newfebh=%p bhblocknr=%llu\n", new_de,
1220 new_de, newfe_blkno, newfe_bh, newfe_bh ? 1222 (unsigned long long)newfe_blkno, newfe_bh, newfe_bh ?
1221 (unsigned long long)newfe_bh->b_blocknr : 0ULL); 1223 (unsigned long long)newfe_bh->b_blocknr : 0ULL);
1222 1224
1223 if (S_ISDIR(new_inode->i_mode) || (new_inode->i_nlink == 1)) { 1225 if (S_ISDIR(new_inode->i_mode) || (new_inode->i_nlink == 1)) {
@@ -1354,8 +1356,8 @@ static int ocfs2_rename(struct inode *old_dir,
1354 if (new_dir_nlink != new_dir->i_nlink) { 1356 if (new_dir_nlink != new_dir->i_nlink) {
1355 if (!new_dir_bh) { 1357 if (!new_dir_bh) {
1356 mlog(ML_ERROR, "need to change nlink for new " 1358 mlog(ML_ERROR, "need to change nlink for new "
1357 "dir %"MLFu64" from %d to %d but bh is " 1359 "dir %llu from %d to %d but bh is NULL\n",
1358 "NULL\n", OCFS2_I(new_dir)->ip_blkno, 1360 (unsigned long long)OCFS2_I(new_dir)->ip_blkno,
1359 (int)new_dir_nlink, new_dir->i_nlink); 1361 (int)new_dir_nlink, new_dir->i_nlink);
1360 } else { 1362 } else {
1361 struct ocfs2_dinode *fe; 1363 struct ocfs2_dinode *fe;
@@ -1372,10 +1374,9 @@ static int ocfs2_rename(struct inode *old_dir,
1372 if (old_dir_nlink != old_dir->i_nlink) { 1374 if (old_dir_nlink != old_dir->i_nlink) {
1373 if (!old_dir_bh) { 1375 if (!old_dir_bh) {
1374 mlog(ML_ERROR, "need to change nlink for old dir " 1376 mlog(ML_ERROR, "need to change nlink for old dir "
1375 "%"MLFu64" from %d to %d but bh is NULL!\n", 1377 "%llu from %d to %d but bh is NULL!\n",
1376 OCFS2_I(old_dir)->ip_blkno, 1378 (unsigned long long)OCFS2_I(old_dir)->ip_blkno,
1377 (int)old_dir_nlink, 1379 (int)old_dir_nlink, old_dir->i_nlink);
1378 old_dir->i_nlink);
1379 } else { 1380 } else {
1380 struct ocfs2_dinode *fe; 1381 struct ocfs2_dinode *fe;
1381 status = ocfs2_journal_access(handle, old_dir, 1382 status = ocfs2_journal_access(handle, old_dir,
@@ -1634,9 +1635,9 @@ static int ocfs2_symlink(struct inode *dir,
1634 NULL); 1635 NULL);
1635 if (status < 0) { 1636 if (status < 0) {
1636 if (status != -ENOSPC && status != -EINTR) { 1637 if (status != -ENOSPC && status != -EINTR) {
1637 mlog(ML_ERROR, "Failed to extend file to " 1638 mlog(ML_ERROR,
1638 "%"MLFu64"\n", 1639 "Failed to extend file to %llu\n",
1639 newsize); 1640 (unsigned long long)newsize);
1640 mlog_errno(status); 1641 mlog_errno(status);
1641 status = -ENOSPC; 1642 status = -ENOSPC;
1642 } 1643 }
@@ -1716,10 +1717,11 @@ int ocfs2_check_dir_entry(struct inode * dir,
1716 error_msg = "directory entry across blocks"; 1717 error_msg = "directory entry across blocks";
1717 1718
1718 if (error_msg != NULL) 1719 if (error_msg != NULL)
1719 mlog(ML_ERROR, "bad entry in directory #%"MLFu64": %s - " 1720 mlog(ML_ERROR, "bad entry in directory #%llu: %s - "
1720 "offset=%lu, inode=%"MLFu64", rec_len=%d, name_len=%d\n", 1721 "offset=%lu, inode=%llu, rec_len=%d, name_len=%d\n",
1721 OCFS2_I(dir)->ip_blkno, error_msg, offset, 1722 (unsigned long long)OCFS2_I(dir)->ip_blkno, error_msg,
1722 le64_to_cpu(de->inode), rlen, de->name_len); 1723 offset, (unsigned long long)le64_to_cpu(de->inode), rlen,
1724 de->name_len);
1723 return error_msg == NULL ? 1 : 0; 1725 return error_msg == NULL ? 1 : 0;
1724} 1726}
1725 1727
@@ -2021,8 +2023,8 @@ static int ocfs2_blkno_stringify(u64 blkno, char *name)
2021 2023
2022 mlog_entry_void(); 2024 mlog_entry_void();
2023 2025
2024 namelen = snprintf(name, OCFS2_ORPHAN_NAMELEN + 1, "%016"MLFx64, 2026 namelen = snprintf(name, OCFS2_ORPHAN_NAMELEN + 1, "%016llx",
2025 blkno); 2027 (long long)blkno);
2026 if (namelen <= 0) { 2028 if (namelen <= 0) {
2027 if (namelen) 2029 if (namelen)
2028 status = namelen; 2030 status = namelen;
@@ -2167,8 +2169,8 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb,
2167 OCFS2_I(inode)->ip_orphaned_slot = osb->slot_num; 2169 OCFS2_I(inode)->ip_orphaned_slot = osb->slot_num;
2168 spin_unlock(&OCFS2_I(inode)->ip_lock); 2170 spin_unlock(&OCFS2_I(inode)->ip_lock);
2169 2171
2170 mlog(0, "Inode %"MLFu64" orphaned in slot %d\n", 2172 mlog(0, "Inode %llu orphaned in slot %d\n",
2171 OCFS2_I(inode)->ip_blkno, osb->slot_num); 2173 (unsigned long long)OCFS2_I(inode)->ip_blkno, osb->slot_num);
2172 2174
2173leave: 2175leave:
2174 if (orphan_dir_inode) 2176 if (orphan_dir_inode)
@@ -2202,8 +2204,9 @@ int ocfs2_orphan_del(struct ocfs2_super *osb,
2202 goto leave; 2204 goto leave;
2203 } 2205 }
2204 2206
2205 mlog(0, "removing '%s' from orphan dir %"MLFu64" (namelen=%d)\n", 2207 mlog(0, "removing '%s' from orphan dir %llu (namelen=%d)\n",
2206 name, OCFS2_I(orphan_dir_inode)->ip_blkno, OCFS2_ORPHAN_NAMELEN); 2208 name, (unsigned long long)OCFS2_I(orphan_dir_inode)->ip_blkno,
2209 OCFS2_ORPHAN_NAMELEN);
2207 2210
2208 /* find it's spot in the orphan directory */ 2211 /* find it's spot in the orphan directory */
2209 target_de_bh = ocfs2_find_entry(name, OCFS2_ORPHAN_NAMELEN, 2212 target_de_bh = ocfs2_find_entry(name, OCFS2_ORPHAN_NAMELEN,
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index e89de9b6e491..da1093039c01 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -357,8 +357,8 @@ static inline int ocfs2_is_soft_readonly(struct ocfs2_super *osb)
357#define OCFS2_RO_ON_INVALID_DINODE(__sb, __di) do { \ 357#define OCFS2_RO_ON_INVALID_DINODE(__sb, __di) do { \
358 typeof(__di) ____di = (__di); \ 358 typeof(__di) ____di = (__di); \
359 ocfs2_error((__sb), \ 359 ocfs2_error((__sb), \
360 "Dinode # %"MLFu64" has bad signature %.*s", \ 360 "Dinode # %llu has bad signature %.*s", \
361 (____di)->i_blkno, 7, \ 361 (unsigned long long)(____di)->i_blkno, 7, \
362 (____di)->i_signature); \ 362 (____di)->i_signature); \
363} while (0); 363} while (0);
364 364
@@ -368,8 +368,8 @@ static inline int ocfs2_is_soft_readonly(struct ocfs2_super *osb)
368#define OCFS2_RO_ON_INVALID_EXTENT_BLOCK(__sb, __eb) do { \ 368#define OCFS2_RO_ON_INVALID_EXTENT_BLOCK(__sb, __eb) do { \
369 typeof(__eb) ____eb = (__eb); \ 369 typeof(__eb) ____eb = (__eb); \
370 ocfs2_error((__sb), \ 370 ocfs2_error((__sb), \
371 "Extent Block # %"MLFu64" has bad signature %.*s", \ 371 "Extent Block # %llu has bad signature %.*s", \
372 (____eb)->h_blkno, 7, \ 372 (unsigned long long)(____eb)->h_blkno, 7, \
373 (____eb)->h_signature); \ 373 (____eb)->h_signature); \
374} while (0); 374} while (0);
375 375
@@ -379,8 +379,8 @@ static inline int ocfs2_is_soft_readonly(struct ocfs2_super *osb)
379#define OCFS2_RO_ON_INVALID_GROUP_DESC(__sb, __gd) do { \ 379#define OCFS2_RO_ON_INVALID_GROUP_DESC(__sb, __gd) do { \
380 typeof(__gd) ____gd = (__gd); \ 380 typeof(__gd) ____gd = (__gd); \
381 ocfs2_error((__sb), \ 381 ocfs2_error((__sb), \
382 "Group Descriptor # %"MLFu64" has bad signature %.*s", \ 382 "Group Descriptor # %llu has bad signature %.*s", \
383 (____gd)->bg_blkno, 7, \ 383 (unsigned long long)(____gd)->bg_blkno, 7, \
384 (____gd)->bg_signature); \ 384 (____gd)->bg_signature); \
385} while (0); 385} while (0);
386 386
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index c46c164aefbb..195523090c87 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -157,8 +157,9 @@ static int ocfs2_block_group_fill(struct ocfs2_journal_handle *handle,
157 mlog_entry_void(); 157 mlog_entry_void();
158 158
159 if (((unsigned long long) bg_bh->b_blocknr) != group_blkno) { 159 if (((unsigned long long) bg_bh->b_blocknr) != group_blkno) {
160 ocfs2_error(alloc_inode->i_sb, "group block (%"MLFu64") " 160 ocfs2_error(alloc_inode->i_sb, "group block (%llu) != "
161 "!= b_blocknr (%llu)", group_blkno, 161 "b_blocknr (%llu)",
162 (unsigned long long)group_blkno,
162 (unsigned long long) bg_bh->b_blocknr); 163 (unsigned long long) bg_bh->b_blocknr);
163 status = -EIO; 164 status = -EIO;
164 goto bail; 165 goto bail;
@@ -280,8 +281,8 @@ static int ocfs2_block_group_alloc(struct ocfs2_super *osb,
280 281
281 /* setup the group */ 282 /* setup the group */
282 bg_blkno = ocfs2_clusters_to_blocks(osb->sb, bit_off); 283 bg_blkno = ocfs2_clusters_to_blocks(osb->sb, bit_off);
283 mlog(0, "new descriptor, record %u, at block %"MLFu64"\n", 284 mlog(0, "new descriptor, record %u, at block %llu\n",
284 alloc_rec, bg_blkno); 285 alloc_rec, (unsigned long long)bg_blkno);
285 286
286 bg_bh = sb_getblk(osb->sb, bg_blkno); 287 bg_bh = sb_getblk(osb->sb, bg_blkno);
287 if (!bg_bh) { 288 if (!bg_bh) {
@@ -382,8 +383,8 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
382 goto bail; 383 goto bail;
383 } 384 }
384 if (!(fe->i_flags & cpu_to_le32(OCFS2_CHAIN_FL))) { 385 if (!(fe->i_flags & cpu_to_le32(OCFS2_CHAIN_FL))) {
385 ocfs2_error(alloc_inode->i_sb, "Invalid chain allocator " 386 ocfs2_error(alloc_inode->i_sb, "Invalid chain allocator %llu",
386 "# %"MLFu64, le64_to_cpu(fe->i_blkno)); 387 (unsigned long long)le64_to_cpu(fe->i_blkno));
387 status = -EIO; 388 status = -EIO;
388 goto bail; 389 goto bail;
389 } 390 }
@@ -829,9 +830,10 @@ static int ocfs2_relink_block_group(struct ocfs2_journal_handle *handle,
829 goto out; 830 goto out;
830 } 831 }
831 832
832 mlog(0, "In suballoc %"MLFu64", chain %u, move group %"MLFu64" to " 833 mlog(0, "Suballoc %llu, chain %u, move group %llu to top, prev = %llu\n",
833 "top, prev = %"MLFu64"\n", 834 (unsigned long long)fe->i_blkno, chain,
834 fe->i_blkno, chain, bg->bg_blkno, prev_bg->bg_blkno); 835 (unsigned long long)bg->bg_blkno,
836 (unsigned long long)prev_bg->bg_blkno);
835 837
836 fe_ptr = le64_to_cpu(fe->id2.i_chain.cl_recs[chain].c_blkno); 838 fe_ptr = le64_to_cpu(fe->id2.i_chain.cl_recs[chain].c_blkno);
837 bg_ptr = le64_to_cpu(bg->bg_next_group); 839 bg_ptr = le64_to_cpu(bg->bg_next_group);
@@ -974,8 +976,9 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
974 struct ocfs2_group_desc *bg; 976 struct ocfs2_group_desc *bg;
975 977
976 chain = ac->ac_chain; 978 chain = ac->ac_chain;
977 mlog(0, "trying to alloc %u bits from chain %u, inode %"MLFu64"\n", 979 mlog(0, "trying to alloc %u bits from chain %u, inode %llu\n",
978 bits_wanted, chain, OCFS2_I(alloc_inode)->ip_blkno); 980 bits_wanted, chain,
981 (unsigned long long)OCFS2_I(alloc_inode)->ip_blkno);
979 982
980 status = ocfs2_read_block(OCFS2_SB(alloc_inode->i_sb), 983 status = ocfs2_read_block(OCFS2_SB(alloc_inode->i_sb),
981 le64_to_cpu(cl->cl_recs[chain].c_blkno), 984 le64_to_cpu(cl->cl_recs[chain].c_blkno),
@@ -1027,8 +1030,8 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
1027 goto bail; 1030 goto bail;
1028 } 1031 }
1029 1032
1030 mlog(0, "alloc succeeds: we give %u bits from block group %"MLFu64"\n", 1033 mlog(0, "alloc succeeds: we give %u bits from block group %llu\n",
1031 tmp_bits, bg->bg_blkno); 1034 tmp_bits, (unsigned long long)bg->bg_blkno);
1032 1035
1033 *num_bits = tmp_bits; 1036 *num_bits = tmp_bits;
1034 1037
@@ -1092,8 +1095,8 @@ static int ocfs2_search_chain(struct ocfs2_alloc_context *ac,
1092 goto bail; 1095 goto bail;
1093 } 1096 }
1094 1097
1095 mlog(0, "Allocated %u bits from suballocator %"MLFu64"\n", 1098 mlog(0, "Allocated %u bits from suballocator %llu\n", *num_bits,
1096 *num_bits, fe->i_blkno); 1099 (unsigned long long)fe->i_blkno);
1097 1100
1098 *bg_blkno = le64_to_cpu(bg->bg_blkno); 1101 *bg_blkno = le64_to_cpu(bg->bg_blkno);
1099bail: 1102bail:
@@ -1134,9 +1137,9 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_super *osb,
1134 } 1137 }
1135 if (le32_to_cpu(fe->id1.bitmap1.i_used) >= 1138 if (le32_to_cpu(fe->id1.bitmap1.i_used) >=
1136 le32_to_cpu(fe->id1.bitmap1.i_total)) { 1139 le32_to_cpu(fe->id1.bitmap1.i_total)) {
1137 ocfs2_error(osb->sb, "Chain allocator dinode %"MLFu64" has %u" 1140 ocfs2_error(osb->sb, "Chain allocator dinode %llu has %u used "
1138 "used bits but only %u total.", 1141 "bits but only %u total.",
1139 le64_to_cpu(fe->i_blkno), 1142 (unsigned long long)le64_to_cpu(fe->i_blkno),
1140 le32_to_cpu(fe->id1.bitmap1.i_used), 1143 le32_to_cpu(fe->id1.bitmap1.i_used),
1141 le32_to_cpu(fe->id1.bitmap1.i_total)); 1144 le32_to_cpu(fe->id1.bitmap1.i_total));
1142 status = -EIO; 1145 status = -EIO;
@@ -1479,10 +1482,9 @@ static int ocfs2_free_suballoc_bits(struct ocfs2_journal_handle *handle,
1479 } 1482 }
1480 BUG_ON((count + start_bit) > ocfs2_bits_per_group(cl)); 1483 BUG_ON((count + start_bit) > ocfs2_bits_per_group(cl));
1481 1484
1482 mlog(0, "suballocator %"MLFu64": freeing %u bits from group %"MLFu64 1485 mlog(0, "%llu: freeing %u bits from group %llu, starting at %u\n",
1483 ", starting at %u\n", 1486 (unsigned long long)OCFS2_I(alloc_inode)->ip_blkno, count,
1484 OCFS2_I(alloc_inode)->ip_blkno, count, bg_blkno, 1487 (unsigned long long)bg_blkno, start_bit);
1485 start_bit);
1486 1488
1487 status = ocfs2_read_block(osb, bg_blkno, &group_bh, OCFS2_BH_CACHED, 1489 status = ocfs2_read_block(osb, bg_blkno, &group_bh, OCFS2_BH_CACHED,
1488 alloc_inode); 1490 alloc_inode);
@@ -1592,10 +1594,10 @@ int ocfs2_free_clusters(struct ocfs2_journal_handle *handle,
1592 ocfs2_block_to_cluster_group(bitmap_inode, start_blk, &bg_blkno, 1594 ocfs2_block_to_cluster_group(bitmap_inode, start_blk, &bg_blkno,
1593 &bg_start_bit); 1595 &bg_start_bit);
1594 1596
1595 mlog(0, "want to free %u clusters starting at block %"MLFu64"\n", 1597 mlog(0, "want to free %u clusters starting at block %llu\n",
1596 num_clusters, start_blk); 1598 num_clusters, (unsigned long long)start_blk);
1597 mlog(0, "bg_blkno = %"MLFu64", bg_start_bit = %u\n", 1599 mlog(0, "bg_blkno = %llu, bg_start_bit = %u\n",
1598 bg_blkno, bg_start_bit); 1600 (unsigned long long)bg_blkno, bg_start_bit);
1599 1601
1600 status = ocfs2_free_suballoc_bits(handle, bitmap_inode, bitmap_bh, 1602 status = ocfs2_free_suballoc_bits(handle, bitmap_inode, bitmap_bh,
1601 bg_start_bit, bg_blkno, 1603 bg_start_bit, bg_blkno,
@@ -1616,18 +1618,22 @@ static inline void ocfs2_debug_bg(struct ocfs2_group_desc *bg)
1616 printk("bg_free_bits_count: %u\n", bg->bg_free_bits_count); 1618 printk("bg_free_bits_count: %u\n", bg->bg_free_bits_count);
1617 printk("bg_chain: %u\n", bg->bg_chain); 1619 printk("bg_chain: %u\n", bg->bg_chain);
1618 printk("bg_generation: %u\n", le32_to_cpu(bg->bg_generation)); 1620 printk("bg_generation: %u\n", le32_to_cpu(bg->bg_generation));
1619 printk("bg_next_group: %"MLFu64"\n", bg->bg_next_group); 1621 printk("bg_next_group: %llu\n",
1620 printk("bg_parent_dinode: %"MLFu64"\n", bg->bg_parent_dinode); 1622 (unsigned long long)bg->bg_next_group);
1621 printk("bg_blkno: %"MLFu64"\n", bg->bg_blkno); 1623 printk("bg_parent_dinode: %llu\n",
1624 (unsigned long long)bg->bg_parent_dinode);
1625 printk("bg_blkno: %llu\n",
1626 (unsigned long long)bg->bg_blkno);
1622} 1627}
1623 1628
1624static inline void ocfs2_debug_suballoc_inode(struct ocfs2_dinode *fe) 1629static inline void ocfs2_debug_suballoc_inode(struct ocfs2_dinode *fe)
1625{ 1630{
1626 int i; 1631 int i;
1627 1632
1628 printk("Suballoc Inode %"MLFu64":\n", fe->i_blkno); 1633 printk("Suballoc Inode %llu:\n", (unsigned long long)fe->i_blkno);
1629 printk("i_signature: %s\n", fe->i_signature); 1634 printk("i_signature: %s\n", fe->i_signature);
1630 printk("i_size: %"MLFu64"\n", fe->i_size); 1635 printk("i_size: %llu\n",
1636 (unsigned long long)fe->i_size);
1631 printk("i_clusters: %u\n", fe->i_clusters); 1637 printk("i_clusters: %u\n", fe->i_clusters);
1632 printk("i_generation: %u\n", 1638 printk("i_generation: %u\n",
1633 le32_to_cpu(fe->i_generation)); 1639 le32_to_cpu(fe->i_generation));
@@ -1645,7 +1651,7 @@ static inline void ocfs2_debug_suballoc_inode(struct ocfs2_dinode *fe)
1645 fe->id2.i_chain.cl_recs[i].c_free); 1651 fe->id2.i_chain.cl_recs[i].c_free);
1646 printk("fe->id2.i_chain.cl_recs[%d].c_total: %u\n", i, 1652 printk("fe->id2.i_chain.cl_recs[%d].c_total: %u\n", i,
1647 fe->id2.i_chain.cl_recs[i].c_total); 1653 fe->id2.i_chain.cl_recs[i].c_total);
1648 printk("fe->id2.i_chain.cl_recs[%d].c_blkno: %"MLFu64"\n", i, 1654 printk("fe->id2.i_chain.cl_recs[%d].c_blkno: %llu\n", i,
1649 fe->id2.i_chain.cl_recs[i].c_blkno); 1655 (unsigned long long)fe->id2.i_chain.cl_recs[i].c_blkno);
1650 } 1656 }
1651} 1657}
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",
diff --git a/fs/ocfs2/uptodate.c b/fs/ocfs2/uptodate.c
index 300b5bedfb21..04a684dfdd96 100644
--- a/fs/ocfs2/uptodate.c
+++ b/fs/ocfs2/uptodate.c
@@ -119,8 +119,8 @@ void ocfs2_metadata_cache_purge(struct inode *inode)
119 tree = !(oi->ip_flags & OCFS2_INODE_CACHE_INLINE); 119 tree = !(oi->ip_flags & OCFS2_INODE_CACHE_INLINE);
120 to_purge = ci->ci_num_cached; 120 to_purge = ci->ci_num_cached;
121 121
122 mlog(0, "Purge %u %s items from Inode %"MLFu64"\n", to_purge, 122 mlog(0, "Purge %u %s items from Inode %llu\n", to_purge,
123 tree ? "array" : "tree", oi->ip_blkno); 123 tree ? "array" : "tree", (unsigned long long)oi->ip_blkno);
124 124
125 /* If we're a tree, save off the root so that we can safely 125 /* If we're a tree, save off the root so that we can safely
126 * initialize the cache. We do the work to free tree members 126 * initialize the cache. We do the work to free tree members
@@ -136,8 +136,8 @@ void ocfs2_metadata_cache_purge(struct inode *inode)
136 * easily detect counting errors. Unfortunately, this is only 136 * easily detect counting errors. Unfortunately, this is only
137 * meaningful for trees. */ 137 * meaningful for trees. */
138 if (tree && purged != to_purge) 138 if (tree && purged != to_purge)
139 mlog(ML_ERROR, "Inode %"MLFu64", count = %u, purged = %u\n", 139 mlog(ML_ERROR, "Inode %llu, count = %u, purged = %u\n",
140 oi->ip_blkno, to_purge, purged); 140 (unsigned long long)oi->ip_blkno, to_purge, purged);
141} 141}
142 142
143/* Returns the index in the cache array, -1 if not found. 143/* Returns the index in the cache array, -1 if not found.
@@ -186,8 +186,9 @@ static int ocfs2_buffer_cached(struct ocfs2_inode_info *oi,
186 186
187 spin_lock(&oi->ip_lock); 187 spin_lock(&oi->ip_lock);
188 188
189 mlog(0, "Inode %"MLFu64", query block %llu (inline = %u)\n", 189 mlog(0, "Inode %llu, query block %llu (inline = %u)\n",
190 oi->ip_blkno, (unsigned long long) bh->b_blocknr, 190 (unsigned long long)oi->ip_blkno,
191 (unsigned long long) bh->b_blocknr,
191 !!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE)); 192 !!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE));
192 193
193 if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE) 194 if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE)
@@ -293,12 +294,12 @@ static void ocfs2_expand_cache(struct ocfs2_inode_info *oi,
293 struct ocfs2_caching_info *ci = &oi->ip_metadata_cache; 294 struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
294 295
295 mlog_bug_on_msg(ci->ci_num_cached != OCFS2_INODE_MAX_CACHE_ARRAY, 296 mlog_bug_on_msg(ci->ci_num_cached != OCFS2_INODE_MAX_CACHE_ARRAY,
296 "Inode %"MLFu64", num cached = %u, should be %u\n", 297 "Inode %llu, num cached = %u, should be %u\n",
297 oi->ip_blkno, ci->ci_num_cached, 298 (unsigned long long)oi->ip_blkno, ci->ci_num_cached,
298 OCFS2_INODE_MAX_CACHE_ARRAY); 299 OCFS2_INODE_MAX_CACHE_ARRAY);
299 mlog_bug_on_msg(!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE), 300 mlog_bug_on_msg(!(oi->ip_flags & OCFS2_INODE_CACHE_INLINE),
300 "Inode %"MLFu64" not marked as inline anymore!\n", 301 "Inode %llu not marked as inline anymore!\n",
301 oi->ip_blkno); 302 (unsigned long long)oi->ip_blkno);
302 assert_spin_locked(&oi->ip_lock); 303 assert_spin_locked(&oi->ip_lock);
303 304
304 /* Be careful to initialize the tree members *first* because 305 /* Be careful to initialize the tree members *first* because
@@ -316,8 +317,8 @@ static void ocfs2_expand_cache(struct ocfs2_inode_info *oi,
316 tree[i] = NULL; 317 tree[i] = NULL;
317 } 318 }
318 319
319 mlog(0, "Expanded %"MLFu64" to a tree cache: flags 0x%x, num = %u\n", 320 mlog(0, "Expanded %llu to a tree cache: flags 0x%x, num = %u\n",
320 oi->ip_blkno, oi->ip_flags, ci->ci_num_cached); 321 (unsigned long long)oi->ip_blkno, oi->ip_flags, ci->ci_num_cached);
321} 322}
322 323
323/* Slow path function - memory allocation is necessary. See the 324/* Slow path function - memory allocation is necessary. See the
@@ -332,8 +333,9 @@ static void __ocfs2_set_buffer_uptodate(struct ocfs2_inode_info *oi,
332 struct ocfs2_meta_cache_item *tree[OCFS2_INODE_MAX_CACHE_ARRAY] = 333 struct ocfs2_meta_cache_item *tree[OCFS2_INODE_MAX_CACHE_ARRAY] =
333 { NULL, }; 334 { NULL, };
334 335
335 mlog(0, "Inode %"MLFu64", block %llu, expand = %d\n", 336 mlog(0, "Inode %llu, block %llu, expand = %d\n",
336 oi->ip_blkno, (unsigned long long) block, expand_tree); 337 (unsigned long long)oi->ip_blkno,
338 (unsigned long long)block, expand_tree);
337 339
338 new = kmem_cache_alloc(ocfs2_uptodate_cachep, GFP_KERNEL); 340 new = kmem_cache_alloc(ocfs2_uptodate_cachep, GFP_KERNEL);
339 if (!new) { 341 if (!new) {
@@ -414,8 +416,9 @@ void ocfs2_set_buffer_uptodate(struct inode *inode,
414 if (ocfs2_buffer_cached(oi, bh)) 416 if (ocfs2_buffer_cached(oi, bh))
415 return; 417 return;
416 418
417 mlog(0, "Inode %"MLFu64", inserting block %llu\n", oi->ip_blkno, 419 mlog(0, "Inode %llu, inserting block %llu\n",
418 (unsigned long long) bh->b_blocknr); 420 (unsigned long long)oi->ip_blkno,
421 (unsigned long long)bh->b_blocknr);
419 422
420 /* No need to recheck under spinlock - insertion is guarded by 423 /* No need to recheck under spinlock - insertion is guarded by
421 * ip_io_mutex */ 424 * ip_io_mutex */
@@ -504,8 +507,9 @@ void ocfs2_remove_from_cache(struct inode *inode,
504 struct ocfs2_caching_info *ci = &oi->ip_metadata_cache; 507 struct ocfs2_caching_info *ci = &oi->ip_metadata_cache;
505 508
506 spin_lock(&oi->ip_lock); 509 spin_lock(&oi->ip_lock);
507 mlog(0, "Inode %"MLFu64", remove %llu, items = %u, array = %u\n", 510 mlog(0, "Inode %llu, remove %llu, items = %u, array = %u\n",
508 oi->ip_blkno, (unsigned long long) block, ci->ci_num_cached, 511 (unsigned long long)oi->ip_blkno,
512 (unsigned long long) block, ci->ci_num_cached,
509 oi->ip_flags & OCFS2_INODE_CACHE_INLINE); 513 oi->ip_flags & OCFS2_INODE_CACHE_INLINE);
510 514
511 if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE) { 515 if (oi->ip_flags & OCFS2_INODE_CACHE_INLINE) {
diff --git a/fs/ocfs2/vote.c b/fs/ocfs2/vote.c
index 021978e0576b..53049a204197 100644
--- a/fs/ocfs2/vote.c
+++ b/fs/ocfs2/vote.c
@@ -190,20 +190,21 @@ static int ocfs2_process_delete_request(struct inode *inode,
190 OCFS2_INVALID_SLOT && 190 OCFS2_INVALID_SLOT &&
191 OCFS2_I(inode)->ip_orphaned_slot != 191 OCFS2_I(inode)->ip_orphaned_slot !=
192 (*orphaned_slot), 192 (*orphaned_slot),
193 "Inode %"MLFu64": This node thinks it's " 193 "Inode %llu: This node thinks it's "
194 "orphaned in slot %d, messaged it's in %d\n", 194 "orphaned in slot %d, messaged it's in %d\n",
195 OCFS2_I(inode)->ip_blkno, 195 (unsigned long long)OCFS2_I(inode)->ip_blkno,
196 OCFS2_I(inode)->ip_orphaned_slot, 196 OCFS2_I(inode)->ip_orphaned_slot,
197 *orphaned_slot); 197 *orphaned_slot);
198 198
199 mlog(0, "Setting orphaned slot for inode %"MLFu64" to %d\n", 199 mlog(0, "Setting orphaned slot for inode %llu to %d\n",
200 OCFS2_I(inode)->ip_blkno, *orphaned_slot); 200 (unsigned long long)OCFS2_I(inode)->ip_blkno,
201 *orphaned_slot);
201 202
202 OCFS2_I(inode)->ip_orphaned_slot = *orphaned_slot; 203 OCFS2_I(inode)->ip_orphaned_slot = *orphaned_slot;
203 } else { 204 } else {
204 mlog(0, "Sending back orphaned slot %d for inode %"MLFu64"\n", 205 mlog(0, "Sending back orphaned slot %d for inode %llu\n",
205 OCFS2_I(inode)->ip_orphaned_slot, 206 OCFS2_I(inode)->ip_orphaned_slot,
206 OCFS2_I(inode)->ip_blkno); 207 (unsigned long long)OCFS2_I(inode)->ip_blkno);
207 208
208 *orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot; 209 *orphaned_slot = OCFS2_I(inode)->ip_orphaned_slot;
209 } 210 }
@@ -226,8 +227,8 @@ static int ocfs2_process_delete_request(struct inode *inode,
226 } 227 }
227 228
228 if (filemap_fdatawrite(inode->i_mapping)) { 229 if (filemap_fdatawrite(inode->i_mapping)) {
229 mlog(ML_ERROR, "Could not sync inode %"MLFu64" for delete!\n", 230 mlog(ML_ERROR, "Could not sync inode %llu for delete!\n",
230 OCFS2_I(inode)->ip_blkno); 231 (unsigned long long)OCFS2_I(inode)->ip_blkno);
231 goto done; 232 goto done;
232 } 233 }
233 sync_mapping_buffers(inode->i_mapping); 234 sync_mapping_buffers(inode->i_mapping);
@@ -302,8 +303,8 @@ static void ocfs2_process_dentry_request(struct inode *inode,
302 struct list_head *p; 303 struct list_head *p;
303 struct ocfs2_inode_info *oi = OCFS2_I(inode); 304 struct ocfs2_inode_info *oi = OCFS2_I(inode);
304 305
305 mlog(0, "parent %"MLFu64", namelen = %u, name = %.*s\n", parent_blkno, 306 mlog(0, "parent %llu, namelen = %u, name = %.*s\n",
306 namelen, namelen, name); 307 (unsigned long long)parent_blkno, namelen, namelen, name);
307 308
308 spin_lock(&dcache_lock); 309 spin_lock(&dcache_lock);
309 310
@@ -370,9 +371,10 @@ static void ocfs2_process_vote(struct ocfs2_super *osb,
370 if (request == OCFS2_VOTE_REQ_DELETE) 371 if (request == OCFS2_VOTE_REQ_DELETE)
371 orphaned_slot = be32_to_cpu(msg->md1.v_orphaned_slot); 372 orphaned_slot = be32_to_cpu(msg->md1.v_orphaned_slot);
372 373
373 mlog(0, "processing vote: request = %u, blkno = %"MLFu64", " 374 mlog(0, "processing vote: request = %u, blkno = %llu, "
374 "generation = %u, node_num = %u, priv1 = %u\n", request, 375 "generation = %u, node_num = %u, priv1 = %u\n", request,
375 blkno, generation, node_num, be32_to_cpu(msg->md1.v_generic1)); 376 (unsigned long long)blkno, generation, node_num,
377 be32_to_cpu(msg->md1.v_generic1));
376 378
377 if (!ocfs2_is_valid_vote_request(request)) { 379 if (!ocfs2_is_valid_vote_request(request)) {
378 mlog(ML_ERROR, "Invalid vote request %d from node %u\n", 380 mlog(ML_ERROR, "Invalid vote request %d from node %u\n",
@@ -419,11 +421,12 @@ static void ocfs2_process_vote(struct ocfs2_super *osb,
419 * we had not found an inode in the first place. */ 421 * we had not found an inode in the first place. */
420 if (inode->i_generation != generation) { 422 if (inode->i_generation != generation) {
421 mlog(0, "generation passed %u != inode generation = %u, " 423 mlog(0, "generation passed %u != inode generation = %u, "
422 "ip_flags = %x, ip_blkno = %"MLFu64", msg %"MLFu64", " 424 "ip_flags = %x, ip_blkno = %llu, msg %llu, i_count = %u, "
423 "i_count = %u, message type = %u\n", 425 "message type = %u\n", generation, inode->i_generation,
424 generation, inode->i_generation, OCFS2_I(inode)->ip_flags, 426 OCFS2_I(inode)->ip_flags,
425 OCFS2_I(inode)->ip_blkno, blkno, 427 (unsigned long long)OCFS2_I(inode)->ip_blkno,
426 atomic_read(&inode->i_count), request); 428 (unsigned long long)blkno, atomic_read(&inode->i_count),
429 request);
427 iput(inode); 430 iput(inode);
428 inode = NULL; 431 inode = NULL;
429 goto respond; 432 goto respond;
@@ -830,8 +833,9 @@ static void ocfs2_delete_response_cb(void *priv,
830 833
831 orphaned_slot = be32_to_cpu(resp->r_orphaned_slot); 834 orphaned_slot = be32_to_cpu(resp->r_orphaned_slot);
832 node = be32_to_cpu(resp->r_hdr.h_node_num); 835 node = be32_to_cpu(resp->r_hdr.h_node_num);
833 mlog(0, "node %d tells us that inode %"MLFu64" is orphaned in slot " 836 mlog(0, "node %d tells us that inode %llu is orphaned in slot %d\n",
834 "%d\n", node, OCFS2_I(inode)->ip_blkno, orphaned_slot); 837 node, (unsigned long long)OCFS2_I(inode)->ip_blkno,
838 orphaned_slot);
835 839
836 /* The other node may not actually know which slot the inode 840 /* The other node may not actually know which slot the inode
837 * is orphaned in. */ 841 * is orphaned in. */
@@ -845,9 +849,9 @@ static void ocfs2_delete_response_cb(void *priv,
845 spin_lock(&OCFS2_I(inode)->ip_lock); 849 spin_lock(&OCFS2_I(inode)->ip_lock);
846 mlog_bug_on_msg(OCFS2_I(inode)->ip_orphaned_slot != orphaned_slot && 850 mlog_bug_on_msg(OCFS2_I(inode)->ip_orphaned_slot != orphaned_slot &&
847 OCFS2_I(inode)->ip_orphaned_slot 851 OCFS2_I(inode)->ip_orphaned_slot
848 != OCFS2_INVALID_SLOT, "Inode %"MLFu64": Node %d " 852 != OCFS2_INVALID_SLOT, "Inode %llu: Node %d says it's "
849 "says it's orphaned in slot %d, we think it's in %d\n", 853 "orphaned in slot %d, we think it's in %d\n",
850 OCFS2_I(inode)->ip_blkno, 854 (unsigned long long)OCFS2_I(inode)->ip_blkno,
851 be32_to_cpu(resp->r_hdr.h_node_num), 855 be32_to_cpu(resp->r_hdr.h_node_num),
852 orphaned_slot, OCFS2_I(inode)->ip_orphaned_slot); 856 orphaned_slot, OCFS2_I(inode)->ip_orphaned_slot);
853 857
@@ -869,8 +873,8 @@ int ocfs2_request_delete_vote(struct inode *inode)
869 delete_cb.rc_cb = ocfs2_delete_response_cb; 873 delete_cb.rc_cb = ocfs2_delete_response_cb;
870 delete_cb.rc_priv = inode; 874 delete_cb.rc_priv = inode;
871 875
872 mlog(0, "Inode %"MLFu64", we start thinking orphaned slot is %d\n", 876 mlog(0, "Inode %llu, we start thinking orphaned slot is %d\n",
873 OCFS2_I(inode)->ip_blkno, orphaned_slot); 877 (unsigned long long)OCFS2_I(inode)->ip_blkno, orphaned_slot);
874 878
875 status = -ENOMEM; 879 status = -ENOMEM;
876 request = ocfs2_new_vote_request(osb, OCFS2_I(inode)->ip_blkno, 880 request = ocfs2_new_vote_request(osb, OCFS2_I(inode)->ip_blkno,
@@ -895,8 +899,8 @@ static void ocfs2_setup_unlink_vote(struct ocfs2_vote_msg *request,
895 * d_delete against it. Parent directory block and full name 899 * d_delete against it. Parent directory block and full name
896 * should suffice. */ 900 * should suffice. */
897 901
898 mlog(0, "unlink/rename request: parent: %"MLFu64" name: %.*s\n", 902 mlog(0, "unlink/rename request: parent: %llu name: %.*s\n",
899 OCFS2_I(parent)->ip_blkno, dentry->d_name.len, 903 (unsigned long long)OCFS2_I(parent)->ip_blkno, dentry->d_name.len,
900 dentry->d_name.name); 904 dentry->d_name.name);
901 905
902 request->v_unlink_parent = cpu_to_be64(OCFS2_I(parent)->ip_blkno); 906 request->v_unlink_parent = cpu_to_be64(OCFS2_I(parent)->ip_blkno);
@@ -1082,7 +1086,8 @@ static int ocfs2_handle_response_message(struct o2net_msg *msg,
1082 mlog(0, "received response message:\n"); 1086 mlog(0, "received response message:\n");
1083 mlog(0, "h_response_id = %u\n", response_id); 1087 mlog(0, "h_response_id = %u\n", response_id);
1084 mlog(0, "h_request = %u\n", be32_to_cpu(resp->r_hdr.h_request)); 1088 mlog(0, "h_request = %u\n", be32_to_cpu(resp->r_hdr.h_request));
1085 mlog(0, "h_blkno = %"MLFu64"\n", be64_to_cpu(resp->r_hdr.h_blkno)); 1089 mlog(0, "h_blkno = %llu\n",
1090 (unsigned long long)be64_to_cpu(resp->r_hdr.h_blkno));
1086 mlog(0, "h_generation = %u\n", be32_to_cpu(resp->r_hdr.h_generation)); 1091 mlog(0, "h_generation = %u\n", be32_to_cpu(resp->r_hdr.h_generation));
1087 mlog(0, "h_node_num = %u\n", node_num); 1092 mlog(0, "h_node_num = %u\n", node_num);
1088 mlog(0, "r_response = %d\n", response_status); 1093 mlog(0, "r_response = %d\n", response_status);
@@ -1138,8 +1143,8 @@ static int ocfs2_handle_vote_message(struct o2net_msg *msg,
1138 mlog(0, "h_response_id = %u\n", 1143 mlog(0, "h_response_id = %u\n",
1139 be32_to_cpu(work->w_msg.v_hdr.h_response_id)); 1144 be32_to_cpu(work->w_msg.v_hdr.h_response_id));
1140 mlog(0, "h_request = %u\n", be32_to_cpu(work->w_msg.v_hdr.h_request)); 1145 mlog(0, "h_request = %u\n", be32_to_cpu(work->w_msg.v_hdr.h_request));
1141 mlog(0, "h_blkno = %"MLFu64"\n", 1146 mlog(0, "h_blkno = %llu\n",
1142 be64_to_cpu(work->w_msg.v_hdr.h_blkno)); 1147 (unsigned long long)be64_to_cpu(work->w_msg.v_hdr.h_blkno));
1143 mlog(0, "h_generation = %u\n", 1148 mlog(0, "h_generation = %u\n",
1144 be32_to_cpu(work->w_msg.v_hdr.h_generation)); 1149 be32_to_cpu(work->w_msg.v_hdr.h_generation));
1145 mlog(0, "h_node_num = %u\n", 1150 mlog(0, "h_node_num = %u\n",
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-29 18:52:28 -0500