From patchwork Fri Mar 4 20:11:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Peterson X-Patchwork-Id: 8507301 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 13FC69F314 for ; Fri, 4 Mar 2016 20:11:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E283200E8 for ; Fri, 4 Mar 2016 20:11:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F709200DB for ; Fri, 4 Mar 2016 20:11:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759193AbcCDULt (ORCPT ); Fri, 4 Mar 2016 15:11:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40282 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758982AbcCDULp (ORCPT ); Fri, 4 Mar 2016 15:11:45 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 78DE7335EB0; Fri, 4 Mar 2016 20:11:45 +0000 (UTC) Received: from loki.redhat.com (ovpn-113-20.phx2.redhat.com [10.3.113.20]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u24KBfrd029578; Fri, 4 Mar 2016 15:11:44 -0500 From: Bob Peterson To: Cc: Jan Kara , Al Viro , Dave Chinner , Christoph Hellwig Subject: [vfs PATCH v3 4/4] GFS2: Use new iomap interface for fiemap Date: Fri, 4 Mar 2016 15:11:40 -0500 Message-Id: <1457122300-28514-5-git-send-email-rpeterso@redhat.com> In-Reply-To: <1457122300-28514-1-git-send-email-rpeterso@redhat.com> References: <1457122300-28514-1-git-send-email-rpeterso@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch switches the GFS2 fiemap interface so that it uses the new iomap infrastructure rather than the old blockmap. Signed-off-by: Bob Peterson --- fs/gfs2/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 1bae189..3625753 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -2090,8 +2090,8 @@ static int gfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, if (ret == 1) ret = 0; } else { - ret = __generic_block_fiemap(inode, fieinfo, start, len, - gfs2_block_map); + ret = __generic_iomap_fiemap(inode, fieinfo, start, len, + gfs2_get_iomap); } gfs2_glock_dq_uninit(&gh);