git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
ocfs2
/
buffer_head_io.c
diff --git
a/fs/ocfs2/buffer_head_io.c
b/fs/ocfs2/buffer_head_io.c
index
9a24adf
..
bae3d75
100644
(file)
--- 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,
int i, ignore_cache = 0;
struct buffer_head *bh;
int i, ignore_cache = 0;
struct buffer_head *bh;
- mlog_entry("(block=(%
llu
), nr=(%d), flags=%d, inode=%p)\n",
-
(unsigned long long)
block, nr, flags, inode);
+ mlog_entry("(block=(%
"MLFu64"
), nr=(%d), flags=%d, inode=%p)\n",
+ block, nr, flags, inode);
if (osb == NULL || osb->sb == NULL || bhs == NULL) {
status = -EINVAL;
if (osb == NULL || osb->sb == NULL || bhs == NULL) {
status = -EINVAL;
@@
-143,9
+143,9
@@
int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
if (flags & OCFS2_BH_CACHED &&
!ocfs2_buffer_uptodate(inode, bh)) {
mlog(ML_UPTODATE,
if (flags & OCFS2_BH_CACHED &&
!ocfs2_buffer_uptodate(inode, bh)) {
mlog(ML_UPTODATE,
- "bh (%llu), inode %
llu
not uptodate\n",
+ "bh (%llu), inode %
"MLFu64"
not uptodate\n",
(unsigned long long)bh->b_blocknr,
(unsigned long long)bh->b_blocknr,
-
(unsigned long long)
OCFS2_I(inode)->ip_blkno);
+ OCFS2_I(inode)->ip_blkno);
ignore_cache = 1;
}
ignore_cache = 1;
}
@@
-222,8
+222,7
@@
int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
if (inode)
mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);
if (inode)
mutex_unlock(&OCFS2_I(inode)->ip_io_mutex);
- mlog(ML_BH_IO, "block=(%llu), nr=(%d), cached=%s\n",
- (unsigned long long)block, nr,
+ mlog(ML_BH_IO, "block=(%"MLFu64"), nr=(%d), cached=%s\n", block, nr,
(!(flags & OCFS2_BH_CACHED) || ignore_cache) ? "no" : "yes");
bail:
(!(flags & OCFS2_BH_CACHED) || ignore_cache) ? "no" : "yes");
bail: