From patchwork Mon Jan 11 21:07:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Peterson X-Patchwork-Id: 8011451 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 55329BEEE5 for ; Mon, 11 Jan 2016 21:07:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A876E200D6 for ; Mon, 11 Jan 2016 21:07:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B57720121 for ; Mon, 11 Jan 2016 21:07:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760562AbcAKVHh (ORCPT ); Mon, 11 Jan 2016 16:07:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37165 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760743AbcAKVHf (ORCPT ); Mon, 11 Jan 2016 16:07:35 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 4BD35C076606 for ; Mon, 11 Jan 2016 21:07:35 +0000 (UTC) Received: from loki.redhat.com (ovpn-113-31.phx2.redhat.com [10.3.113.31]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0BL7X0f020507 for ; Mon, 11 Jan 2016 16:07:35 -0500 From: Bob Peterson To: linux-fsdevel Subject: [vfs PATCH 4/4] GFS2: Use new iomap interface for fiemap Date: Mon, 11 Jan 2016 16:07:32 -0500 Message-Id: <1452546452-18531-5-git-send-email-rpeterso@redhat.com> In-Reply-To: <1452546452-18531-1-git-send-email-rpeterso@redhat.com> References: <1452546452-18531-1-git-send-email-rpeterso@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 1bae189..e722f0f 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -2090,8 +2090,7 @@ 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_glock_dq_uninit(&gh);