ocfs2: Require an inode for ocfs2_read_block(s)().

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / inode.c

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 522297033945564e6301d18de1f3152c5b0c6cfb..6ec31b92a47f2910bae5f10db1ec8cf0a11c556c 100644 (file)
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -461,8 +461,7 @@ static int ocfs2_read_locked_inode(struct inode *inode,
        }
 
        if (can_lock)
-               status = ocfs2_read_block(osb, args->fi_blkno, &bh, 0,
-                                         inode);
+               status = ocfs2_read_block(inode, args->fi_blkno, &bh, 0);
        else
                status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh);
        if (status < 0) {
@@ -1166,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_block(inode, p_blkno, &bh, readflags);
        if (tmperr < 0)
                goto fail;