Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:53954 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727981AbeJ3WMc (ORCPT ); Tue, 30 Oct 2018 18:12:32 -0400 From: Carlos Maiolino To: linux-fsdevel@vger.kernel.org Cc: sandeen@redhat.com, hch@lst.de, david@fromorbit.com, darrick.wong@oracle.com Subject: [PATCH 11/20] nilfs2: Remove direct usage of fiemap_extent_info Date: Tue, 30 Oct 2018 14:18:14 +0100 Message-Id: <20181030131823.29040-12-cmaiolino@redhat.com> In-Reply-To: <20181030131823.29040-1-cmaiolino@redhat.com> References: <20181030131823.29040-1-cmaiolino@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: struct fiemap-extent_info will be gone in later patches, remove its direct usage from nilfs2 Signed-off-by: Carlos Maiolino --- fs/nilfs2/inode.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index a8040ed52bd5..88c13f6c13cd 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -994,7 +994,6 @@ void nilfs_dirty_inode(struct inode *inode, int flags) int nilfs_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 the_nilfs *nilfs = inode->i_sb->s_fs_info; @@ -1029,7 +1028,8 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx) if (size) { /* End of the current extent */ ret = fiemap_fill_next_extent( - fieinfo, logical, phys, size, flags); + (struct fiemap_extent_info *)f_ctx->fc_data, + logical, phys, size, flags); if (ret) break; } @@ -1079,7 +1079,8 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx) flags |= FIEMAP_EXTENT_LAST; ret = fiemap_fill_next_extent( - fieinfo, logical, phys, size, flags); + (struct fiemap_extent_info *)f_ctx->fc_data, + logical, phys, size, flags); if (ret) break; size = 0; @@ -1094,8 +1095,8 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_ctx *f_ctx) } else { /* Terminate the current extent */ ret = fiemap_fill_next_extent( - fieinfo, logical, phys, size, - flags); + (struct fiemap_extent_info *)f_ctx->fc_data, + logical, phys, size, flags); if (ret || blkoff > end_blkoff) break; -- 2.17.1