diff options
| author | Joel Becker <joel.becker@oracle.com> | 2008-10-10 02:20:30 +0200 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-10-14 20:43:29 +0200 |
| commit | 31d33073ca38603dea705dae45e094a64ca062d6 (patch) | |
| tree | cf02beb489456ebc9e07bace80e96ad1150f2cbf /fs/ocfs2/dlmglue.c | |
| parent | ocfs2: Separate out sync reads from ocfs2_read_blocks() (diff) | |
| download | linux-31d33073ca38603dea705dae45e094a64ca062d6.tar.xz linux-31d33073ca38603dea705dae45e094a64ca062d6.zip | |
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/dlmglue.c')
| -rw-r--r-- | fs/ocfs2/dlmglue.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index eae3d643a5e4..3b2cd0f87210 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c @@ -2024,8 +2024,8 @@ static int ocfs2_inode_lock_update(struct inode *inode, } else { /* Boo, we have to go to disk. */ /* read bh, cast, ocfs2_refresh_inode */ - status = ocfs2_read_block(OCFS2_SB(inode->i_sb), oi->ip_blkno, - bh, OCFS2_BH_CACHED, inode); + status = ocfs2_read_block(inode, oi->ip_blkno, + bh, OCFS2_BH_CACHED); if (status < 0) { mlog_errno(status); goto bail_refresh; @@ -2086,11 +2086,10 @@ static int ocfs2_assign_bh(struct inode *inode, return 0; } - status = ocfs2_read_block(OCFS2_SB(inode->i_sb), + status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, ret_bh, - OCFS2_BH_CACHED, - inode); + OCFS2_BH_CACHED); if (status < 0) mlog_errno(status); |