projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] x86_64: Check for bad dma address in b44 1GB DMA workaround
[powerpc.git]
/
fs
/
ocfs2
/
buffer_head_io.c
diff --git
a/fs/ocfs2/buffer_head_io.c
b/fs/ocfs2/buffer_head_io.c
index
d424041
..
9a24adf
100644
(file)
--- a/
fs/ocfs2/buffer_head_io.c
+++ b/
fs/ocfs2/buffer_head_io.c
@@
-58,7
+58,7
@@
int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
goto out;
}
goto out;
}
-
down(&OCFS2_I(inode)->ip_io_sem
);
+
mutex_lock(&OCFS2_I(inode)->ip_io_mutex
);
lock_buffer(bh);
set_buffer_uptodate(bh);
lock_buffer(bh);
set_buffer_uptodate(bh);
@@
-82,7
+82,7
@@
int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,
brelse(bh);
}
brelse(bh);
}
-
up(&OCFS2_I(inode)->ip_io_sem
);
+
mutex_unlock(&OCFS2_I(inode)->ip_io_mutex
);
out:
mlog_exit(ret);
return ret;
out:
mlog_exit(ret);
return ret;
@@
-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=(%
"MLFu64"
), nr=(%d), flags=%d, inode=%p)\n",
- block, nr, flags, inode);
+ mlog_entry("(block=(%
llu
), nr=(%d), flags=%d, inode=%p)\n",
+
(unsigned long long)
block, nr, flags, inode);
if (osb == NULL || osb->sb == NULL || bhs == NULL) {
status = -EINVAL;
if (osb == NULL || osb->sb == NULL || bhs == NULL) {
status = -EINVAL;
@@
-125,13
+125,13
@@
int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
flags &= ~OCFS2_BH_CACHED;
if (inode)
flags &= ~OCFS2_BH_CACHED;
if (inode)
-
down(&OCFS2_I(inode)->ip_io_sem
);
+
mutex_lock(&OCFS2_I(inode)->ip_io_mutex
);
for (i = 0 ; i < nr ; i++) {
if (bhs[i] == NULL) {
bhs[i] = sb_getblk(sb, block++);
if (bhs[i] == NULL) {
if (inode)
for (i = 0 ; i < nr ; i++) {
if (bhs[i] == NULL) {
bhs[i] = sb_getblk(sb, block++);
if (bhs[i] == NULL) {
if (inode)
-
up(&OCFS2_I(inode)->ip_io_sem
);
+
mutex_unlock(&OCFS2_I(inode)->ip_io_mutex
);
status = -EIO;
mlog_errno(status);
goto bail;
status = -EIO;
mlog_errno(status);
goto bail;
@@
-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 %
"MLFu64"
not uptodate\n",
+ "bh (%llu), inode %
llu
not uptodate\n",
(unsigned long long)bh->b_blocknr,
(unsigned long long)bh->b_blocknr,
- OCFS2_I(inode)->ip_blkno);
+
(unsigned long long)
OCFS2_I(inode)->ip_blkno);
ignore_cache = 1;
}
ignore_cache = 1;
}
@@
-220,9
+220,10
@@
int ocfs2_read_blocks(struct ocfs2_super *osb, u64 block, int nr,
ocfs2_set_buffer_uptodate(inode, bh);
}
if (inode)
ocfs2_set_buffer_uptodate(inode, bh);
}
if (inode)
-
up(&OCFS2_I(inode)->ip_io_sem
);
+
mutex_unlock(&OCFS2_I(inode)->ip_io_mutex
);
- mlog(ML_BH_IO, "block=(%"MLFu64"), nr=(%d), cached=%s\n", block, nr,
+ mlog(ML_BH_IO, "block=(%llu), nr=(%d), cached=%s\n",
+ (unsigned long long)block, nr,
(!(flags & OCFS2_BH_CACHED) || ignore_cache) ? "no" : "yes");
bail:
(!(flags & OCFS2_BH_CACHED) || ignore_cache) ? "no" : "yes");
bail: