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>

diff --cc fs/ocfs2/alloc.c
Simple merge

diff --cc fs/ocfs2/aops.c
Simple merge

diff --cc fs/ocfs2/buffer_head_io.h
Simple merge

diff --cc fs/ocfs2/dir.c
Simple merge

diff --cc fs/ocfs2/dlmglue.c
Simple merge

diff --cc fs/ocfs2/extent_map.c
Simple merge

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc fs/ocfs2/inode.c
Simple merge

diff --cc fs/ocfs2/journal.c
Simple merge

diff --cc fs/ocfs2/localalloc.c
Simple merge

diff --cc fs/ocfs2/namei.c
Simple merge

diff --cc fs/ocfs2/resize.c
Simple merge

diff --cc fs/ocfs2/slot_map.c
Simple merge

diff --cc fs/ocfs2/suballoc.c
Simple merge

diff --cc fs/ocfs2/symlink.c
Simple merge

diff --cc fs/ocfs2/xattr.c
Simple merge