diff options
author | Joel Becker <joel.becker@oracle.com> | 2008-10-09 20:20:30 -0400 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2008-10-14 14:43:29 -0400 |
commit | 31d33073ca38603dea705dae45e094a64ca062d6 (patch) | |
tree | cf02beb489456ebc9e07bace80e96ad1150f2cbf /fs/ocfs2/namei.c | |
parent | da1e90985a0e767e44397c9db0937e236033fa58 (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/namei.c')
-rw-r--r-- | fs/ocfs2/namei.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index 7d0dd5c95eb3..e5fc9345dd36 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
@@ -1752,10 +1752,9 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb, | |||
1752 | 1752 | ||
1753 | mlog_entry("(inode->i_ino = %lu)\n", inode->i_ino); | 1753 | mlog_entry("(inode->i_ino = %lu)\n", inode->i_ino); |
1754 | 1754 | ||
1755 | status = ocfs2_read_block(osb, | 1755 | status = ocfs2_read_block(orphan_dir_inode, |
1756 | OCFS2_I(orphan_dir_inode)->ip_blkno, | 1756 | OCFS2_I(orphan_dir_inode)->ip_blkno, |
1757 | &orphan_dir_bh, OCFS2_BH_CACHED, | 1757 | &orphan_dir_bh, OCFS2_BH_CACHED); |
1758 | orphan_dir_inode); | ||
1759 | if (status < 0) { | 1758 | if (status < 0) { |
1760 | mlog_errno(status); | 1759 | mlog_errno(status); |
1761 | goto leave; | 1760 | goto leave; |