aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/dir.c')
-rw-r--r--fs/ocfs2/dir.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 3614651dcdb2..828437ca91ba 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -188,8 +188,8 @@ static struct buffer_head *ocfs2_find_entry_id(const char *name,
188 struct ocfs2_dinode *di; 188 struct ocfs2_dinode *di;
189 struct ocfs2_inline_data *data; 189 struct ocfs2_inline_data *data;
190 190
191 ret = ocfs2_read_block(OCFS2_SB(dir->i_sb), OCFS2_I(dir)->ip_blkno, 191 ret = ocfs2_read_block(dir, OCFS2_I(dir)->ip_blkno, &di_bh,
192 &di_bh, OCFS2_BH_CACHED, dir); 192 OCFS2_BH_CACHED);
193 if (ret) { 193 if (ret) {
194 mlog_errno(ret); 194 mlog_errno(ret);
195 goto out; 195 goto out;
@@ -417,8 +417,8 @@ static inline int ocfs2_delete_entry_id(handle_t *handle,
417 struct ocfs2_dinode *di; 417 struct ocfs2_dinode *di;
418 struct ocfs2_inline_data *data; 418 struct ocfs2_inline_data *data;
419 419
420 ret = ocfs2_read_block(OCFS2_SB(dir->i_sb), OCFS2_I(dir)->ip_blkno, 420 ret = ocfs2_read_block(dir, OCFS2_I(dir)->ip_blkno,
421 &di_bh, OCFS2_BH_CACHED, dir); 421 &di_bh, OCFS2_BH_CACHED);
422 if (ret) { 422 if (ret) {
423 mlog_errno(ret); 423 mlog_errno(ret);
424 goto out; 424 goto out;
@@ -596,8 +596,8 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode,
596 struct ocfs2_inline_data *data; 596 struct ocfs2_inline_data *data;
597 struct ocfs2_dir_entry *de; 597 struct ocfs2_dir_entry *de;
598 598
599 ret = ocfs2_read_block(OCFS2_SB(inode->i_sb), OCFS2_I(inode)->ip_blkno, 599 ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
600 &di_bh, OCFS2_BH_CACHED, inode); 600 &di_bh, OCFS2_BH_CACHED);
601 if (ret) { 601 if (ret) {
602 mlog(ML_ERROR, "Unable to read inode block for dir %llu\n", 602 mlog(ML_ERROR, "Unable to read inode block for dir %llu\n",
603 (unsigned long long)OCFS2_I(inode)->ip_blkno); 603 (unsigned long long)OCFS2_I(inode)->ip_blkno);