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, 2 insertions, 2 deletions

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 6ec31b92a47f..c5ee9e3cf80b 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -461,7 +461,7 @@ static int ocfs2_read_locked_inode(struct inode *inode,
         }
 
         if (can_lock)
-                status = ocfs2_read_block(inode, args->fi_blkno, &bh, 0);
+                status = ocfs2_read_blocks(inode, args->fi_blkno, 1, &bh, 0);
         else
                 status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh);
         if (status < 0) {
@@ -1165,7 +1165,7 @@ struct buffer_head *ocfs2_bread(struct inode *inode,
                 goto fail;
         }
 
-        tmperr = ocfs2_read_block(inode, p_blkno, &bh, readflags);
+        tmperr = ocfs2_read_blocks(inode, p_blkno, 1, &bh, readflags);
         if (tmperr < 0)
                 goto fail;