aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/inode.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2008-10-09 20:20:30 -0400
committerMark Fasheh <mfasheh@suse.com>2008-10-14 14:43:29 -0400
commit31d33073ca38603dea705dae45e094a64ca062d6 (patch)
treecf02beb489456ebc9e07bace80e96ad1150f2cbf /fs/ocfs2/inode.c
parentda1e90985a0e767e44397c9db0937e236033fa58 (diff)
ocfs2: Require an inode for ocfs2_read_block(s)().
Now that synchronous readers are using ocfs2_read_blocks_sync(), all callers of ocfs2_read_blocks() are passing an inode. Use it unconditionally. Since it's there, we don't need to pass the ocfs2_super either. Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/inode.c')
-rw-r--r--fs/ocfs2/inode.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 522297033945..6ec31b92a47f 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -461,8 +461,7 @@ static int ocfs2_read_locked_inode(struct inode *inode,
461 } 461 }
462 462
463 if (can_lock) 463 if (can_lock)
464 status = ocfs2_read_block(osb, args->fi_blkno, &bh, 0, 464 status = ocfs2_read_block(inode, args->fi_blkno, &bh, 0);
465 inode);
466 else 465 else
467 status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh); 466 status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh);
468 if (status < 0) { 467 if (status < 0) {
@@ -1166,8 +1165,7 @@ struct buffer_head *ocfs2_bread(struct inode *inode,
1166 goto fail; 1165 goto fail;
1167 } 1166 }
1168 1167
1169 tmperr = ocfs2_read_block(OCFS2_SB(inode->i_sb), p_blkno, &bh, 1168 tmperr = ocfs2_read_block(inode, p_blkno, &bh, readflags);
1170 readflags, inode);
1171 if (tmperr < 0) 1169 if (tmperr < 0)
1172 goto fail; 1170 goto fail;
1173 1171