1 files changed, 17 insertions, 17 deletions
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,
                        if (rec_end > OCFS2_I(inode)->ip_clusters) {
                                mlog_errno(ret);
                                ocfs2_error(inode->i_sb,
-                                            "Extent %d at e_blkno %"MLFu64" of inode %"MLFu64" goes past ip_clusters of %u\n",
+                                            "Extent %d at e_blkno %llu of inode %llu goes past ip_clusters of %u\n",
                                            i,
-                                            le64_to_cpu(rec->e_blkno),
+                                            (unsigned long long)le64_to_cpu(rec->e_blkno),
-                                            OCFS2_I(inode)->ip_blkno,
+                                            (unsigned long long)OCFS2_I(inode)->ip_blkno,
                                            OCFS2_I(inode)->ip_clusters);
                                goto out_free;
                        }
@@ -233,11 +233,11 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode,
                        if (blkno) {
                                mlog_errno(ret);
                                ocfs2_error(inode->i_sb,
-                                            "Multiple extents for (cpos = %u, clusters = %u) on inode %"MLFu64"; e_blkno %"MLFu64" and rec %d at e_blkno %"MLFu64"\n",
+                                            "Multiple extents for (cpos = %u, clusters = %u) on inode %llu; e_blkno %llu and rec %d at e_blkno %llu\n",
                                            cpos, clusters,
-                                            OCFS2_I(inode)->ip_blkno,
+                                            (unsigned long long)OCFS2_I(inode)->ip_blkno,
-                                            blkno, i,
+                                            (unsigned long long)blkno, i,
-                                            le64_to_cpu(rec->e_blkno));
+                                            (unsigned long long)le64_to_cpu(rec->e_blkno));
                                goto out_free;
                        }
@@ -251,9 +251,9 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode,
                ret = -EBADR;
                if (!blkno) {
                        ocfs2_error(inode->i_sb,
-                                    "No record found for (cpos = %u, clusters = %u) on inode %"MLFu64"\n",
+                                    "No record found for (cpos = %u, clusters = %u) on inode %llu\n",
                                    cpos, clusters,
-                                    OCFS2_I(inode)->ip_blkno);
+                                    (unsigned long long)OCFS2_I(inode)->ip_blkno);
                        mlog_errno(ret);
                        goto out_free;
                }
@@ -288,10 +288,10 @@ static int ocfs2_extent_map_find_leaf(struct inode *inode,
                        ret = -EBADR;
                        mlog_errno(ret);
                        ocfs2_error(inode->i_sb,
-                                    "Extent %d at e_blkno %"MLFu64" of inode %"MLFu64" goes past ip_clusters of %u\n",
+                                    "Extent %d at e_blkno %llu of inode %llu goes past ip_clusters of %u\n",
                                    i,
-                                    le64_to_cpu(rec->e_blkno),
+                                    (unsigned long long)le64_to_cpu(rec->e_blkno),
-                                    OCFS2_I(inode)->ip_blkno,
+                                    (unsigned long long)OCFS2_I(inode)->ip_blkno,
                                    OCFS2_I(inode)->ip_clusters);
                        return ret;
                }
@@ -557,9 +557,9 @@ static int ocfs2_extent_map_insert(struct inode *inode,
                        ret = -EBADR;
                        mlog_errno(ret);
                        ocfs2_error(inode->i_sb,
-                                    "Zero e_clusters on non-tail extent record at e_blkno %"MLFu64" on inode %"MLFu64"\n",
+                                    "Zero e_clusters on non-tail extent record at e_blkno %llu on inode %llu\n",
-                                    le64_to_cpu(rec->e_blkno),
+                                    (unsigned long long)le64_to_cpu(rec->e_blkno),
-                                    OCFS2_I(inode)->ip_blkno);
+                                    (unsigned long long)OCFS2_I(inode)->ip_blkno);
                        return ret;
                }
@@ -660,10 +660,10 @@ int ocfs2_extent_map_append(struct inode *inode,
        mlog_bug_on_msg((le32_to_cpu(rec->e_cpos) +
                         le32_to_cpu(rec->e_clusters)) !=
                        (em->em_clusters + new_clusters),
-                        "Inode %"MLFu64":\n"
+                        "Inode %llu:\n"
                        "rec->e_cpos = %u + rec->e_clusters = %u = %u\n"
                        "em->em_clusters = %u + new_clusters = %u = %u\n",
-                        OCFS2_I(inode)->ip_blkno,
+                        (unsigned long long)OCFS2_I(inode)->ip_blkno,
                        le32_to_cpu(rec->e_cpos), le32_to_cpu(rec->e_clusters),
                        le32_to_cpu(rec->e_cpos) + le32_to_cpu(rec->e_clusters),
                        em->em_clusters, new_clusters,

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,