aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/buffer_head_io.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/buffer_head_io.c')
-rw-r--r--fs/ocfs2/buffer_head_io.c11
1 files changed, 6 insertions, 5 deletions
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: