diff options
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r-- | fs/ocfs2/file.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 408d5a66591d..7a809be54e84 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -545,8 +545,8 @@ static int __ocfs2_extend_allocation(struct inode *inode, u32 logical_start, | |||
545 | */ | 545 | */ |
546 | BUG_ON(mark_unwritten && !ocfs2_sparse_alloc(osb)); | 546 | BUG_ON(mark_unwritten && !ocfs2_sparse_alloc(osb)); |
547 | 547 | ||
548 | status = ocfs2_read_block(osb, OCFS2_I(inode)->ip_blkno, &bh, | 548 | status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh, |
549 | OCFS2_BH_CACHED, inode); | 549 | OCFS2_BH_CACHED); |
550 | if (status < 0) { | 550 | if (status < 0) { |
551 | mlog_errno(status); | 551 | mlog_errno(status); |
552 | goto leave; | 552 | goto leave; |
@@ -1132,8 +1132,7 @@ static int ocfs2_write_remove_suid(struct inode *inode) | |||
1132 | struct buffer_head *bh = NULL; | 1132 | struct buffer_head *bh = NULL; |
1133 | struct ocfs2_inode_info *oi = OCFS2_I(inode); | 1133 | struct ocfs2_inode_info *oi = OCFS2_I(inode); |
1134 | 1134 | ||
1135 | ret = ocfs2_read_block(OCFS2_SB(inode->i_sb), | 1135 | ret = ocfs2_read_block(inode, oi->ip_blkno, &bh, OCFS2_BH_CACHED); |
1136 | oi->ip_blkno, &bh, OCFS2_BH_CACHED, inode); | ||
1137 | if (ret < 0) { | 1136 | if (ret < 0) { |
1138 | mlog_errno(ret); | 1137 | mlog_errno(ret); |
1139 | goto out; | 1138 | goto out; |
@@ -1159,9 +1158,8 @@ static int ocfs2_allocate_unwritten_extents(struct inode *inode, | |||
1159 | struct buffer_head *di_bh = NULL; | 1158 | struct buffer_head *di_bh = NULL; |
1160 | 1159 | ||
1161 | if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) { | 1160 | if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) { |
1162 | ret = ocfs2_read_block(OCFS2_SB(inode->i_sb), | 1161 | ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, |
1163 | OCFS2_I(inode)->ip_blkno, &di_bh, | 1162 | &di_bh, OCFS2_BH_CACHED); |
1164 | OCFS2_BH_CACHED, inode); | ||
1165 | if (ret) { | 1163 | if (ret) { |
1166 | mlog_errno(ret); | 1164 | mlog_errno(ret); |
1167 | goto out; | 1165 | goto out; |