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>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index b77b67bb2776..3ea740d15feb 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -248,8 +248,8 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb)
                 goto bail;
         }
 
-        status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
-                                  &alloc_bh, 0);
+        status = ocfs2_read_blocks(inode, OCFS2_I(inode)->ip_blkno, 1,
+                                   &alloc_bh, 0);
         if (status < 0) {
                 mlog_errno(status);
                 goto bail;
@@ -459,8 +459,8 @@ int ocfs2_begin_local_alloc_recovery(struct ocfs2_super *osb,
 
         mutex_lock(&inode->i_mutex);
 
-        status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
-                                  &alloc_bh, 0);
+        status = ocfs2_read_blocks(inode, OCFS2_I(inode)->ip_blkno, 1,
+                                   &alloc_bh, 0);
         if (status < 0) {
                 mlog_errno(status);
                 goto bail;