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

Now that synchronous readers are using ocfs2_read_blocks_sync(), all
callers of ocfs2_read_blocks() are passing an inode.  Use it
unconditionally.  Since it's there, we don't need to pass the
ocfs2_super either.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 522297033945..6ec31b92a47f 100644
--- 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;