[PATCH 12/20] ocfs2: Remove direct usage of fiemap_extent_info

[Carlos Maiolino <cmaiolino@xxxxxxxxxx>]

struct fiemap-extent_info will be removed in later patches, remove its direct
usage from ocfs2

Signed-off-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
---
 fs/ocfs2/extent_map.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
index 5ba98d7a7a42..cffba6e542f9 100644
--- a/fs/ocfs2/extent_map.c
+++ b/fs/ocfs2/extent_map.c
@@ -714,8 +714,7 @@ int ocfs2_extent_map_get_blocks(struct inode *inode, u64 v_blkno, u64 *p_blkno,
  * mapping per se.
  */
 static int ocfs2_fiemap_inline(struct inode *inode, struct buffer_head *di_bh,
-			       struct fiemap_extent_info *fieinfo,
-			       u64 map_start)
+			       struct fiemap_ctx *f_ctx, u64 map_start)
 {
 	int ret;
 	unsigned int id_count;
@@ -738,8 +737,9 @@ static int ocfs2_fiemap_inline(struct inode *inode, struct buffer_head *di_bh,
 			phys += offsetof(struct ocfs2_dinode,
 					 id2.i_data.id_data);
 
-		ret = fiemap_fill_next_extent(fieinfo, 0, phys, id_count,
-					      flags);
+		ret = fiemap_fill_next_extent(
+				(struct fiemap_extent_info *)f_ctx->fc_data,
+				0, phys, id_count, flags);
 		if (ret < 0)
 			return ret;
 	}
@@ -751,7 +751,6 @@ static int ocfs2_fiemap_inline(struct inode *inode, struct buffer_head *di_bh,
 
 int ocfs2_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
 {
-	struct fiemap_extent_info *fieinfo = f_ctx->fc_data;
 	u64 map_start = f_ctx->fc_start;
 	u64 map_len = f_ctx->fc_len;
 	int ret, is_last;
@@ -779,7 +778,7 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
 	 */
 	if ((OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) ||
 	    ocfs2_inode_is_fast_symlink(inode)) {
-		ret = ocfs2_fiemap_inline(inode, di_bh, fieinfo, map_start);
+		ret = ocfs2_fiemap_inline(inode, di_bh, f_ctx, map_start);
 		goto out_unlock;
 	}
 
@@ -813,8 +812,9 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
 		phys_bytes = le64_to_cpu(rec.e_blkno) << osb->sb->s_blocksize_bits;
 		virt_bytes = (u64)le32_to_cpu(rec.e_cpos) << osb->s_clustersize_bits;
 
-		ret = fiemap_fill_next_extent(fieinfo, virt_bytes, phys_bytes,
-					      len_bytes, fe_flags);
+		ret = fiemap_fill_next_extent(
+				(struct fiemap_extent_info*)f_ctx->fc_data,
+				virt_bytes, phys_bytes, len_bytes, fe_flags);
 		if (ret)
 			break;
 
-- 
2.17.1