From patchwork Tue Oct 30 13:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 10660903 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 3E015109C for ; Tue, 30 Oct 2018 13:19:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37ED02A3D8 for ; Tue, 30 Oct 2018 13:19:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B74E2A3CD; Tue, 30 Oct 2018 13:19:09 +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 CFED32A3CD for ; Tue, 30 Oct 2018 13:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728107AbeJ3WMc (ORCPT ); Tue, 30 Oct 2018 18:12:32 -0400 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 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 02E1C17C501; Tue, 30 Oct 2018 13:19:08 +0000 (UTC) Received: from odin.usersys.redhat.com (unknown [10.40.205.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F3545DEDE; Tue, 30 Oct 2018 13:19:06 +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 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> 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.39]); Tue, 30 Oct 2018 13:19:08 +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 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;