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 9d92c85..c5ee9e3 100644 (file)
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -460,8 +460,10 @@ static int ocfs2_read_locked_inode(struct inode *inode,
                }
        }
 
-       status = ocfs2_read_block(osb, args->fi_blkno, &bh, 0,
-                                 can_lock ? inode : NULL);
+       if (can_lock)
+               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) {
                mlog_errno(status);
                goto bail;
@@ -1163,8 +1165,7 @@ struct buffer_head *ocfs2_bread(struct inode *inode,
                goto fail;
        }
 
-       tmperr = ocfs2_read_block(OCFS2_SB(inode->i_sb), p_blkno, &bh,
-                                 readflags, inode);
+       tmperr = ocfs2_read_blocks(inode, p_blkno, 1, &bh, readflags);
        if (tmperr < 0)
                goto fail;
 
@@ -1174,10 +1175,9 @@ struct buffer_head *ocfs2_bread(struct inode *inode,
        return bh;
 
 fail:
-       if (bh) {
-               brelse(bh);
-               bh = NULL;
-       }
+       brelse(bh);
+       bh = NULL;
+
        *err = -EIO;
        return NULL;
 }