From patchwork Wed May 30 09:58:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10438189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2069D602CC for ; Wed, 30 May 2018 09:59:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11ED02818E for ; Wed, 30 May 2018 09:59:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06B89288E8; Wed, 30 May 2018 09:59:18 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0C532818E for ; Wed, 30 May 2018 09:59:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9ABA46B0007; Wed, 30 May 2018 05:59:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 95C876B000C; Wed, 30 May 2018 05:59:10 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B8BF6B0273; Wed, 30 May 2018 05:59:10 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 365DE6B0007 for ; Wed, 30 May 2018 05:59:10 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id e16-v6so10656944pfn.5 for ; Wed, 30 May 2018 02:59:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=746jRWiysgcCFEshhSBosQZgPkdBmH6y3XPADOphmoQ=; b=TAOvdpOXnyGt+AcI29sYzci7OqZ1nD2uhr+ULcjXoQtkeulsE5pt/Nj0m1jcbJQZ4e vSJTCAFSoiZTCmNROXGYU0aQYMI63RZogOdH4faFqD3kv3gHGOHemxet3C/VtxB+B5So 0Jj2Gr1gr9Lhi+AwxdtEGlg0aIyvUSfJ8LnRuQIXj+1tytigRxyCp6MDas/l7tVga/Hd BI8kil7PXk3e+3/xKDBbCXtpEiF5XlJaQGjbzA5dEXqDWopuLmTc7gYHm9iCW7pJ6/c1 BGKDGuB/BlJx+HdhduKJuN7DlgFyDLLbvsbq6uytQCnH6kW4wUw2F+lWqvW4ml6ZaJEo a/2A== X-Gm-Message-State: ALKqPwd9iIdYoPWSpYg5Q+78aOP7MSJ8X6/nWNxbqDi53FRMLuwzuVPX pVywAqnmDZPDet2CE61hgUZFWDOpH7/GD+zfpbVVhIWyZAWLtLdsNt4wo3p7A7MU9JiSaI8yofD 8tGx0mkZWFzkW8RFrsnDjjXC1tUIV7LHhbdcgmjEX/mNbh0EHq+j34g000DVJDbA= X-Received: by 2002:a65:4289:: with SMTP id j9-v6mr1703455pgp.136.1527674349906; Wed, 30 May 2018 02:59:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJJxuK1LjkAnECOYM8QcIw4FZ5pbWFRl4ZK+9TMIi3ZsiSTIXxuiFD1kXbBCjis+SsXs4gH X-Received: by 2002:a65:4289:: with SMTP id j9-v6mr1703407pgp.136.1527674348969; Wed, 30 May 2018 02:59:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674348; cv=none; d=google.com; s=arc-20160816; b=huKgG/eTWnHi1bPCB8OKaauIeAiqXcX/XP315Ika4Dh/rEjDql1VTKR9brrAHLS9Aw AOSyMnyu5aERVuroMYvXZlyHrvK074CzF30CY3TcG4LgbRZt4BYbwTBVmTe/Uaq8jlvA 6EINSIjOU0WzLs68wsr2fN0iCVQftM4gdndhtsr8GOkApY9MCLcCQdNO/asNVbzLgSNk ZEcxrEfGdOtP/TeD6O4dNb2sOdK9IqqCGiSjfoJAmalpWyqZ7ysXVJilLdEBmZSsUDvG lUeMOEndZl9r860foBu51aJykgHCd5gtkOs8BQ/0fnwuSGdUnnhxbwaR9zLgciEbkFT6 dHZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=746jRWiysgcCFEshhSBosQZgPkdBmH6y3XPADOphmoQ=; b=etPJ/+KrAt4C3RhkUmOGDq8Jh/iiQLuA2CihqfRzbRxky69Cu0cz6ArqdPStOhWPCN +Npcsbz+yASBNCzzLRDVWHpFId1y4q23SfVxA1sX0YL02FUDFYa0IPQAUTU+MMIPCVv3 zfmE7WAU3fVv3jGKigd5U64klD36Nnng17NdGPGx7eZeOq01bOAPv/7i+leQi/H1/Aqv Xt19GO0crHmb0RyRu12zTrQm6SdaMROSZtTDX6gj1/lOcwObsI7q7KZww+F8nu2I8yiv uiM88o+P8WrOt2Eo3uMhuNUEgpDueuXWhiIOfp0mVvXk8k9lJPQKYvoLGm6n25SrGJ5d 1jOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=t9+PZz57; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id w28-v6si1295985pge.329.2018.05.30.02.59.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 02:59:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=t9+PZz57; spf=pass (google.com: best guess record for domain of batv+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+1f4557cc97fec8e307c5+5393+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=746jRWiysgcCFEshhSBosQZgPkdBmH6y3XPADOphmoQ=; b=t9+PZz57wwgv9y9ur+5SwrE8H 8hVPadNoaekCDgLd+3RAD0yWjlON7K/jZUtkwOIMVSnOKwNOq5RXcFKG/ExGP32SC9Cw17ZumflSe WUcBf+FhVTXbRIvPzXGKIpf2759LW+6/FlZKYUHYS6IlLPy9OSniPtVmP5rfKeptyu4Nz8YAUC75u NsxXe7OLVXZPPeQncEWaXCJW2mBEiJ0KfwTjeh+0TDttAMrrIqXlYew3LgZts40U1BfRTgm0q759d mt+KWXmuXfkkpDjqdM5WJpHk/940FiQCl1jHe+RfTLU17/qebsX301QweKAHz22lnxuK2ygB7O70K csutU8QiQ==; Received: from 213-225-38-123.nat.highway.a1.net ([213.225.38.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNxsp-0006ZT-JD; Wed, 30 May 2018 09:59:08 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 12/13] xfs: use iomap_bmap Date: Wed, 30 May 2018 11:58:12 +0200 Message-Id: <20180530095813.31245-13-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530095813.31245-1-hch@lst.de> References: <20180530095813.31245-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Switch to the iomap based bmap implementation to get rid of one of the last users of xfs_get_blocks. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/xfs/xfs_aops.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 80de476cecf8..56e405572909 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -1378,10 +1378,9 @@ xfs_vm_bmap( struct address_space *mapping, sector_t block) { - struct inode *inode = (struct inode *)mapping->host; - struct xfs_inode *ip = XFS_I(inode); + struct xfs_inode *ip = XFS_I(mapping->host); - trace_xfs_vm_bmap(XFS_I(inode)); + trace_xfs_vm_bmap(ip); /* * The swap code (ab-)uses ->bmap to get a block mapping and then @@ -1394,9 +1393,7 @@ xfs_vm_bmap( */ if (xfs_is_reflink_inode(ip) || XFS_IS_REALTIME_INODE(ip)) return 0; - - filemap_write_and_wait(mapping); - return generic_block_bmap(mapping, block, xfs_get_blocks); + return iomap_bmap(mapping, block, &xfs_iomap_ops); } STATIC int