ocfs2: Simplify ocfs2_read_block()

[safe/jmp/linux-2.6] / fs / ocfs2 / inode.c

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 6ec31b9..c5ee9e3 100644 (file)
--- 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;