diff options
| author | Joel Becker <joel.becker@oracle.com> | 2008-10-09 17:20:30 -0700 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-10-14 11:43:29 -0700 |
| commit | 31d33073ca38603dea705dae45e094a64ca062d6 (patch) | |
| tree | cf02beb489456ebc9e07bace80e96ad1150f2cbf /fs/ocfs2/slot_map.c | |
| parent | da1e90985a0e767e44397c9db0937e236033fa58 (diff) | |
| download | op-kernel-dev-31d33073ca38603dea705dae45e094a64ca062d6.zip op-kernel-dev-31d33073ca38603dea705dae45e094a64ca062d6.tar.gz | |
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/slot_map.c')
| -rw-r--r-- | fs/ocfs2/slot_map.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c index bb5ff89..82d986b 100644 --- a/fs/ocfs2/slot_map.c +++ b/fs/ocfs2/slot_map.c @@ -150,8 +150,7 @@ int ocfs2_refresh_slot_info(struct ocfs2_super *osb) * be !NULL. Thus, ocfs2_read_blocks() will ignore blocknr. If * this is not true, the read of -1 (UINT64_MAX) will fail. */ - ret = ocfs2_read_blocks(osb, -1, si->si_blocks, si->si_bh, 0, - si->si_inode); + ret = ocfs2_read_blocks(si->si_inode, -1, si->si_blocks, si->si_bh, 0); if (ret == 0) { spin_lock(&osb->osb_lock); ocfs2_update_slot_info(si); @@ -404,7 +403,7 @@ static int ocfs2_map_slot_buffers(struct ocfs2_super *osb, (unsigned long long)blkno); bh = NULL; /* Acquire a fresh bh */ - status = ocfs2_read_block(osb, blkno, &bh, 0, si->si_inode); + status = ocfs2_read_block(si->si_inode, blkno, &bh, 0); if (status < 0) { mlog_errno(status); goto bail; |
