diff mbox series

[06/20] iomap: Update iomap_fiemap to use new fiemap_ctx structure

Message ID 20181030131823.29040-7-cmaiolino@redhat.com (mailing list archive)
State New, archived
Headers show
Series New ->fiemap infrastructure and ->bmap removal | expand

Commit Message

Carlos Maiolino Oct. 30, 2018, 1:18 p.m. UTC 
iomap_fiemap() isn't directly called by ioctl_fiemap(), so it doesn't
needed to be changed when fiemap_ctx has been added, update it now.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
 fs/gfs2/inode.c       | 3 +--
 fs/iomap.c            | 3 ++-
 fs/xfs/xfs_iops.c     | 4 ++--
 include/linux/iomap.h | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

Comments

Christoph Hellwig Nov. 16, 2018, 3:48 p.m. UTC | #1 
On Tue, Oct 30, 2018 at 02:18:09PM +0100, Carlos Maiolino wrote:
> iomap_fiemap() isn't directly called by ioctl_fiemap(), so it doesn't
> needed to be changed when fiemap_ctx has been added, update it now.

That sentence has some grammar issues.

How about simply:

"Update iomap_fiemap to take a struct fiemap_ctx".

> -	struct fiemap_extent_info *fieinfo = f_ctx->fc_data;
>  	u64 start = f_ctx->fc_start;
>  	u64 len = f_ctx->fc_len;
>  	struct gfs2_inode *ip = GFS2_I(inode);
> @@ -2019,7 +2018,7 @@ static int gfs2_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
>  	if (ret)
>  		goto out;
>  
> -	ret = iomap_fiemap(inode, fieinfo, start, len, &gfs2_iomap_ops);
> +	ret = iomap_fiemap(inode, f_ctx, start, len, &gfs2_iomap_ops);

I think we should get rid of the start and len argument as well.
diff mbox series

Patch

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 2a4ce713c209..bf461e3f012c 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -2006,7 +2006,6 @@  static int gfs2_getattr(const struct path *path, struct kstat *stat,
 
 static int gfs2_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
 {
-	struct fiemap_extent_info *fieinfo = f_ctx->fc_data;
 	u64 start = f_ctx->fc_start;
 	u64 len = f_ctx->fc_len;
 	struct gfs2_inode *ip = GFS2_I(inode);
@@ -2019,7 +2018,7 @@  static int gfs2_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx)
 	if (ret)
 		goto out;
 
-	ret = iomap_fiemap(inode, fieinfo, start, len, &gfs2_iomap_ops);
+	ret = iomap_fiemap(inode, f_ctx, start, len, &gfs2_iomap_ops);
 
 	gfs2_glock_dq_uninit(&gh);
 
diff --git a/fs/iomap.c b/fs/iomap.c
index 838b405a9037..42b131e1c955 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -1155,9 +1155,10 @@  iomap_fiemap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
 	}
 }
 
-int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi,
+int iomap_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx,
 		loff_t start, loff_t len, const struct iomap_ops *ops)
 {
+	struct fiemap_extent_info *fi = f_ctx->fc_data;
 	struct fiemap_iomap_ctx ctx;
 	loff_t ret;
 
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index d33d56fa8097..22c479862ba6 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1103,10 +1103,10 @@  xfs_vn_fiemap(
 	xfs_ilock(XFS_I(inode), XFS_IOLOCK_SHARED);
 	if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) {
 		fieinfo->fi_flags &= ~FIEMAP_FLAG_XATTR;
-		error = iomap_fiemap(inode, fieinfo, start, length,
+		error = iomap_fiemap(inode, f_ctx, start, length,
 				&xfs_xattr_iomap_ops);
 	} else {
-		error = iomap_fiemap(inode, fieinfo, start, length,
+		error = iomap_fiemap(inode, f_ctx, start, length,
 				&xfs_iomap_ops);
 	}
 	xfs_iunlock(XFS_I(inode), XFS_IOLOCK_SHARED);
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 9a4258154b25..7ce84be499d6 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -144,8 +144,8 @@  int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
 		const struct iomap_ops *ops);
 vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf,
 			const struct iomap_ops *ops);
-int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
-		loff_t start, loff_t len, const struct iomap_ops *ops);
+int iomap_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx, loff_t start,
+		 loff_t len, const struct iomap_ops *ops);
 loff_t iomap_seek_hole(struct inode *inode, loff_t offset,
 		const struct iomap_ops *ops);
 loff_t iomap_seek_data(struct inode *inode, loff_t offset,