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, 5 insertions, 7 deletions

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 408d5a66591d..7a809be54e84 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -545,8 +545,8 @@ static int __ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
          */
         BUG_ON(mark_unwritten && !ocfs2_sparse_alloc(osb));
 
-        status = ocfs2_read_block(osb, OCFS2_I(inode)->ip_blkno, &bh,
-                                  OCFS2_BH_CACHED, inode);
+        status = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno, &bh,
+                                  OCFS2_BH_CACHED);
         if (status < 0) {
                 mlog_errno(status);
                 goto leave;
@@ -1132,8 +1132,7 @@ static int ocfs2_write_remove_suid(struct inode *inode)
         struct buffer_head *bh = NULL;
         struct ocfs2_inode_info *oi = OCFS2_I(inode);
 
-        ret = ocfs2_read_block(OCFS2_SB(inode->i_sb),
-                               oi->ip_blkno, &bh, OCFS2_BH_CACHED, inode);
+        ret = ocfs2_read_block(inode, oi->ip_blkno, &bh, OCFS2_BH_CACHED);
         if (ret < 0) {
                 mlog_errno(ret);
                 goto out;
@@ -1159,9 +1158,8 @@ static int ocfs2_allocate_unwritten_extents(struct inode *inode,
         struct buffer_head *di_bh = NULL;
 
         if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) {
-                ret = ocfs2_read_block(OCFS2_SB(inode->i_sb),
-                                       OCFS2_I(inode)->ip_blkno, &di_bh,
-                                       OCFS2_BH_CACHED, inode);
+                ret = ocfs2_read_block(inode, OCFS2_I(inode)->ip_blkno,
+                                       &di_bh, OCFS2_BH_CACHED);
                 if (ret) {
                         mlog_errno(ret);
                         goto out;