aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/aops.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/aops.c')
-rw-r--r--fs/ocfs2/aops.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 98e16fb49e4b..f232a0e3c30f 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -68,9 +68,8 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
68 goto bail; 68 goto bail;
69 } 69 }
70 70
71 status = ocfs2_read_block(OCFS2_SB(inode->i_sb), 71 status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
72 OCFS2_I(inode)->ip_blkno, 72 &bh, OCFS2_BH_CACHED);
73 &bh, OCFS2_BH_CACHED, inode);
74 if (status < 0) { 73 if (status < 0) {
75 mlog_errno(status); 74 mlog_errno(status);
76 goto bail; 75 goto bail;
@@ -260,13 +259,12 @@ static int ocfs2_readpage_inline(struct inode *inode, struct page *page)
260{ 259{
261 int ret; 260 int ret;
262 struct buffer_head *di_bh = NULL; 261 struct buffer_head *di_bh = NULL;
263 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
264 262
265 BUG_ON(!PageLocked(page)); 263 BUG_ON(!PageLocked(page));
266 BUG_ON(!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL)); 264 BUG_ON(!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL));
267 265
268 ret = ocfs2_read_block(osb, OCFS2_I(inode)->ip_blkno, &di_bh, 266 ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &di_bh,
269 OCFS2_BH_CACHED, inode); 267 OCFS2_BH_CACHED);
270 if (ret) { 268 if (ret) {
271 mlog_errno(ret); 269 mlog_errno(ret);
272 goto out; 270 goto out;