From patchwork Fri May 18 16:48:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10411299 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 B36BB6031B for ; Fri, 18 May 2018 16:49:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A46D228619 for ; Fri, 18 May 2018 16:49:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98F24288BD; Fri, 18 May 2018 16:49:38 +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 1F63428619 for ; Fri, 18 May 2018 16:49:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B520A6B0616; Fri, 18 May 2018 12:49:24 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AD97D6B0617; Fri, 18 May 2018 12:49:24 -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 8DE126B0618; Fri, 18 May 2018 12:49:24 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id 425E66B0616 for ; Fri, 18 May 2018 12:49:24 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id d4-v6so5333473plr.17 for ; Fri, 18 May 2018 09:49:24 -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=27hnClfbDMc/KvcEuSvBw4ACOspeLoR933PdxXUe6jM=; b=ZS7j7EQAhSJNxBHc9qezcgWFk3AGtRaWI0qDtTztqEwO8sp4XV2b4XuIVsFNYHGlLB ptVOm2ru8P5oWSO/Qn06mpoWqNgg1q9ozWEHopYs3TU1QP0PdQrSO5QtvWkUOzyAOMnr sPDwM7I8iu6DsSMp2oEuFIxBdHWzTPA4v/cBa3o3boO6ARtFmppolyRNVELW/caaO97D QlqB10aKlU4OVTdGkJZBh64lkJVtUz3EL9FXa28CKIYVZvk1xRjJ8fH965ERpiW/CYqU /cCPktOv54vdhcfwNmFJh2WtDEzBHiCnb89KZG9Ju5A5PPl7eCRB3bUfaNqFqpHJ7hSI oxDA== X-Gm-Message-State: ALKqPweip2dYdifLSvZ1CspypmjNQVhQHQTkX+DZZdsrQhpyaJKKy2WO aAREd0yipS05xtYc3YV7SYDj4DWFu9jZVpFSPApU2YsyMw0UwN1nNnCS+2bLBBpwB96Nrg7SBjW mFxabPAFzYwMBJS3P0N+aCyGjuG/fA7j8eKaaKMCvhIESytJdrw1T7G5IsdicaOA= X-Received: by 2002:a17:902:7c0e:: with SMTP id x14-v6mr10491852pll.389.1526662163947; Fri, 18 May 2018 09:49:23 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqMBrGFDeuKtKtB5JQjk1JCKoPsiSISN9j1Gd6InYFJw4MGY6R4sTze3kIZMyWu/rnUY4d2 X-Received: by 2002:a17:902:7c0e:: with SMTP id x14-v6mr10491825pll.389.1526662163358; Fri, 18 May 2018 09:49:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526662163; cv=none; d=google.com; s=arc-20160816; b=xmWouGbKLXdI0+bZsqGmdmaietvjY7DLMe+YeWndDD507grawXb2bjolwkj5YofsPG NMkPlokUL6ZNuaGTvO82sGmBWKZqSXY9YdMqGmfMw739/izGKrXCobrvXQU9FxtZHcw0 SKIpXx+JKwzevA3zv3UH/T0yPisTdBJw9fCXNEccmJnHidvNdie20LiYRYNRaAVCR/Xw Jc50/JRU6Q3sGPUdGMw792UZreSRTat4FFTE4NlJN/e/oIPVPj70OHEoikI3YxXW7RDs 9fzqRFRGUNfpEwKAbgB0ivMUhUOtT7rVbZPHDPAwYbNtTaq5paMtcQt79uR/pkNZPaRa pYOw== 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=27hnClfbDMc/KvcEuSvBw4ACOspeLoR933PdxXUe6jM=; b=xIr8zWKVf5dFuSTp0ECLPqFtBa0WthNyCDHCgPZhuWxCWQD4gavuQCmqGEmlTfqBTt RDc0vqWG1m/tb7dea/TtuP/CV5GJ1YPvN16vnXB0FHJaswIFFHeZ4LYp6kPmvcGWI7Vr HosfHlM3ed4cI7bUmn9B3xVTqPC6nYbHsqxrENVCkIFMltyCvgktC+zN/9rJZCzmPIMm /6fnY1YArdJ0Gm4blvJeFq1axxx3x1lgwnWymKLZQwc4eohdXFiSOypT/AjemzBrewHe +myAn5tQW/S87kXk8/Bg9utV3daXRVcPLxF/3udXRUch4n/iHBJF+Tlt8TP1RMys8Hf4 cokw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=SG0x/xTq; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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 v6-v6si8190756plp.60.2018.05.18.09.49.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 May 2018 09:49:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+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=SG0x/xTq; spf=pass (google.com: best guess record for domain of batv+77ddf8e9b1b344f28472+5381+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+77ddf8e9b1b344f28472+5381+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=27hnClfbDMc/KvcEuSvBw4ACOspeLoR933PdxXUe6jM=; b=SG0x/xTq2Ytho57rUeJiHSMCY hnDv4EIknePydVvmhrm/yCVBg1VPZeDfNBIPXCsj9BcD+lRPt4/E/bY6VK2i7+K7Gz9rhlE5awbTk 2HhT2HDCfRza3BARJ0HMvOtKcdgWU74hBWVELDbHsHo7rBO6ZPQari7TusrL0IhbZL0gllH8r7e7T XMKR9y96Khms8gN7/pqayK5G89e2LsdrsHrj++6sm2wIqGmXNbTbMiiMsrh4mqjKbijajAafUAJ/j 46raMUlTLQGWsyeAq3K7KC26RQ6+YN/v89nNd9JiuaUCEHFQ+wDXRRGkj3CqBiqPjkxpCWmvpm/Qe Tp2JXsIGw==; Received: from 80-109-164-210.cable.dynamic.surfer.at ([80.109.164.210] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJiZG-0006aC-Ea; Fri, 18 May 2018 16:49:22 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 17/34] xfs: use iomap_bmap Date: Fri, 18 May 2018 18:48:13 +0200 Message-Id: <20180518164830.1552-18-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518164830.1552-1-hch@lst.de> References: <20180518164830.1552-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 --- 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