Message ID | 20180531180614.21506-14-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 E8CB1602BC for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 31 May 2018 18:07:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D57DC28E05 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 31 May 2018 18:07:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9B2C28F91; Thu, 31 May 2018 18:07:15 +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 D7EFF28E05 for <patchwork-linux-mm@patchwork.kernel.org>; Thu, 31 May 2018 18:07:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F4D96B0278; Thu, 31 May 2018 14:07:03 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0A8DE6B027A; Thu, 31 May 2018 14:07:03 -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 E3FB86B027B; Thu, 31 May 2018 14:07:02 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f71.google.com (mail-pl0-f71.google.com [209.85.160.71]) by kanga.kvack.org (Postfix) with ESMTP id 9B6306B0278 for <linux-mm@kvack.org>; Thu, 31 May 2018 14:07:02 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id e1-v6so13634588pld.23 for <linux-mm@kvack.org>; Thu, 31 May 2018 11:07:02 -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=v1vpOB2Nq+VgwoyT3uX+OSS1hcsiMUiv4O0MhEuf8RQ=; b=bmaa8eQ/2Elmo/Oppipkff429tlDhWl/GZptkxTOfMTY2IduS70e+dYgW/sqoXsG0s 08VS7jOLYHW5ro8F58SmvcbpMtEntXPcb6NFegprPt8pwe/rvgqadslUfd40lfYyCWhc RwX+CiPSrtrYlrjRhMkDYCJrRku4GpMjB3kUZE1z2yt4KsKKt/AAxD2f17IG1xCn+n2g GUtMFJzqYJILudT+rgusMYmHn6ToxpltMUqL2aTQxFHiiAJWEHUEG7sllez0+E7knH6+ j4X0ik/xDLybLvPrcCghH6JS32MUXpPMUKLL6P2JI90Bt8lECchBxLmKVhoEjM6I8Ydb yKBQ== X-Gm-Message-State: ALKqPwcbavOxcPmJa8bz/TJ8vR9rPE9OwyEtD76wgvFp+Yxj0EqP4/js WlSHk5BWr3hjR0uD8ijyPCInfX/8OIsK1RHy2Wz8Tuf9LOVEa6ODSz3uP41t/Xyt0J/+wsLAxIp vI+BJZpoAEGjjl8rMlJLBePzgeo15AICjxvsMxalEDplR2JUL95LpjrLnu3OJZA4= X-Received: by 2002:a17:902:8d8e:: with SMTP id v14-v6mr7974679plo.387.1527790022347; Thu, 31 May 2018 11:07:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJCwaziMdTRxCU5TqPkwRyPy0RMtoowxfDLI6qnpxA4M78L8BQXLLjCAwcpKXTSVCeXDtfh X-Received: by 2002:a17:902:8d8e:: with SMTP id v14-v6mr7974645plo.387.1527790021724; Thu, 31 May 2018 11:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527790021; cv=none; d=google.com; s=arc-20160816; b=JmTAo/kylJna44NZcQnGVSAc8/aJoFAxIs5XD4gLUyzgK9iP9erXjC5hjou/Rs9+xg iOO8y2DBpXOoJk/om+6OC4I8YUMmrxtCqRVh56BpG2bIgmr3U2L0/lDeMWFLACR/ByiJ lTkHeKWBCstrf+ihFvFkRdYbzm7PYC5vID4IifkK6XF2kxT2km19JtTN+KAdXeMWPgR3 qv+W3fmwGwL/vU0f4guP5+tQnGFGIYxOHqGaLJ8cU+HYFtxq3vjyJHL7Ze/J5SfFlNdB 2YWwlA/zuZquoTdqKYoBqxttMkOoXqWJf2MQR2JgMVG76X+AnizRAT1vnjcVPMv/gff0 UPmQ== 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=v1vpOB2Nq+VgwoyT3uX+OSS1hcsiMUiv4O0MhEuf8RQ=; b=UUuz4DOWMxZrrTJssHareftdgkqVF1hKnmjfucqfMW0lg0JT9f4hsd1gnT2ZgOEv+5 SE86Xq+vEA+g9gaAbN0Ri490NuMoZNS3AUraepjSYksushh0mCfNePI3cq9is31pA5Qp XgSfys/bgx4Bwv9GQknhYO19VvfNa1w16i/y+X2Q2ZwSOVGAL+VfssrWtpgThgclA/p9 BITSg8A6iEIfLw3AcMW7UOt7vOejjmzysUmt9v4v8XidppK2H1HymfOZV+cXJrs+v2zg w6cv2+PQbSGuatnfsnIE3dBUQX+4bfTA9dFaYoT4tyNdbKHbcBsVVy6jlttio9bSYAbD wDyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=rFEWayFz; spf=pass (google.com: best guess record for domain of batv+67dfbb8f664e29ec4bbc+5394+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+67dfbb8f664e29ec4bbc+5394+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 h16-v6si10164677pgv.354.2018.05.31.11.07.01 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 May 2018 11:07:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+67dfbb8f664e29ec4bbc+5394+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=rFEWayFz; spf=pass (google.com: best guess record for domain of batv+67dfbb8f664e29ec4bbc+5394+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+67dfbb8f664e29ec4bbc+5394+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=v1vpOB2Nq+VgwoyT3uX+OSS1hcsiMUiv4O0MhEuf8RQ=; b=rFEWayFzK7CmV3PDGLts57u4h sNLzc9dYs9NQU/UMq927hKhr0JFhm0n2pTEzlDoUopN6XG18gw5bjQt5/EDj5O6IjGvrPD8KDDB37 SUUZlY2HFT8/CXM4J3ZehgJbPdFkn0wF3EpKtK4+AwwZ8xDu+t5tLHUyywbaVvSDVaDvpQ3tnFe5m GJ8sZ0yhGqVgmC/HBcHAhQ2TYPkLTYUydwz+5FnisCe4bpNEUpyRkgCaZR5xjdhXIbWHnk5LlIExl dldtnzNgBXHx3gyDsogMjhmzco8tCG17do52z5jsfgP3Y+7ZxoX+PEBfhcLos26H/iuGhwN7NlA0b yCyfCPGWg==; 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 1fORyW-0003UO-Ne; Thu, 31 May 2018 18:07:01 +0000 From: Christoph Hellwig <hch@lst.de> To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 13/13] xfs: use iomap for blocksize == PAGE_SIZE readpage and readpages Date: Thu, 31 May 2018 20:06:14 +0200 Message-Id: <20180531180614.21506-14-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180531180614.21506-1-hch@lst.de> References: <20180531180614.21506-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from <hch@infradead.org> 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: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 56e405572909..c631c457b444 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -1402,6 +1402,8 @@ xfs_vm_readpage( struct page *page) { trace_xfs_vm_readpage(page->mapping->host, 1); + if (i_blocksize(page->mapping->host) == PAGE_SIZE) + return iomap_readpage(page, &xfs_iomap_ops); return mpage_readpage(page, xfs_get_blocks); } @@ -1413,6 +1415,8 @@ xfs_vm_readpages( unsigned nr_pages) { trace_xfs_vm_readpages(mapping->host, nr_pages); + if (i_blocksize(mapping->host) == PAGE_SIZE) + return iomap_readpages(mapping, pages, nr_pages, &xfs_iomap_ops); return mpage_readpages(mapping, pages, nr_pages, xfs_get_blocks); }