From patchwork Tue Oct 30 13:18:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 10660893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73BD11734 for ; Tue, 30 Oct 2018 13:19:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DA952A3CD for ; Tue, 30 Oct 2018 13:19:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6202F2A3F8; Tue, 30 Oct 2018 13:19:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 044FD2A3CD for ; Tue, 30 Oct 2018 13:19:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727991AbeJ3WMX (ORCPT ); Tue, 30 Oct 2018 18:12:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38180 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727606AbeJ3WMX (ORCPT ); Tue, 30 Oct 2018 18:12:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C2C392F35; Tue, 30 Oct 2018 13:18:58 +0000 (UTC) Received: from odin.usersys.redhat.com (unknown [10.40.205.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 719125DEDE; Tue, 30 Oct 2018 13:18:55 +0000 (UTC) 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 06/20] iomap: Update iomap_fiemap to use new fiemap_ctx structure Date: Tue, 30 Oct 2018 14:18:09 +0100 Message-Id: <20181030131823.29040-7-cmaiolino@redhat.com> In-Reply-To: <20181030131823.29040-1-cmaiolino@redhat.com> References: <20181030131823.29040-1-cmaiolino@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 30 Oct 2018 13:18:58 +0000 (UTC) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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(-) 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,