summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/slot_map.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2008-10-09 17:20:31 -0700
committerMark Fasheh <mfasheh@suse.com>2008-10-14 11:51:57 -0700
commit0fcaa56a2a020dd6f90c202b7084e6f4cbedb6c2 (patch)
tree057204016523ce0274d4a23ec02944075f084e8c /fs/ocfs2/slot_map.c
parent31d33073ca38603dea705dae45e094a64ca062d6 (diff)
downloadlinux-0fcaa56a2a020dd6f90c202b7084e6f4cbedb6c2.tar.gz
linux-0fcaa56a2a020dd6f90c202b7084e6f4cbedb6c2.tar.bz2
linux-0fcaa56a2a020dd6f90c202b7084e6f4cbedb6c2.zip
ocfs2: Simplify ocfs2_read_block()
More than 30 callers of ocfs2_read_block() pass exactly OCFS2_BH_CACHED. Only six pass a different flag set. Rather than have every caller care, let's make ocfs2_read_block() take no flags and always do a cached read. The remaining six places can call ocfs2_read_blocks() directly. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
index 82d986bff7fe..357d3fe18c3f 100644
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -403,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(si->si_inode, blkno, &bh, 0);
+ status = ocfs2_read_blocks(si->si_inode, blkno, 1, &bh, 0);
if (status < 0) {
mlog_errno(status);
goto bail;