From patchwork Wed May 30 09:58: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: 10438191 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 7F905602CC for ; Wed, 30 May 2018 09:59:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D89D2818E for ; Wed, 30 May 2018 09:59:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60126288E8; Wed, 30 May 2018 09:59:22 +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 F32F22818E for ; Wed, 30 May 2018 09:59:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 711536B0273; Wed, 30 May 2018 05:59:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6C1226B0274; Wed, 30 May 2018 05:59:14 -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 5B3216B0275; Wed, 30 May 2018 05:59:14 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 162036B0273 for ; Wed, 30 May 2018 05:59:14 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id e7-v6so10582092pfi.8 for ; Wed, 30 May 2018 02:59:14 -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=h8l4CoRBuvEp1v/MIU4ANAfHjNrZLHxXUgohw7zIfAI=; b=F3A6OF6pJSkLVIzl5zcf1kg3prq5w2ZI16b3H1AFg3TUP8smoeGWJVUrgbT9FwaDoG Bgnx6jfbG/Sm2TGvmugdD9H7JYKhKj6efckD41qGODfA4IG7TAFQ/0Hz7F7VJkwvL2aG VgDlycLVP/kstpTTpAWNYCYVSFzKajiQc8O6go/OtYqNvdT6ELlsmuVZ1oyyhAQfde/N M3p9D6nVb5GY09YgYKkju30YEl/w2UKuY7Vbj82f+nRJxroe291GunfhDtHQqeITedZe aQFI8L+yZvW5lUOH4fj8Zfqa+hIsJMzRdK48Zj6Aa3oo42ROsNB49a4Oftz3HnVtYe71 YiHg== X-Gm-Message-State: ALKqPwdDuY0Z3YhkzcE30u0dgUWV+NzLYo47yvwMzWAt/VR5CKmbogc5 j+epeK5ngVQ/dgIa/U2/4fWKSw/khF6IpGmu6stQ97W0KyY7GiFDtgqvkbi0quoYor6QwKamESN YqqXD6MHnqOjLWyi1BrTJWUjjb/pLzR2LRnVZe4smfBGb9hMfnf08ibCBfnhTO/M= X-Received: by 2002:a17:902:9b8f:: with SMTP id y15-v6mr2227662plp.187.1527674353796; Wed, 30 May 2018 02:59:13 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLbEiXZOwhBRf0kL78TY/o0+XW/BwDsn5tbeqBvtL4OCb9UvWiGxmpPiEoeiunfC2EUTJNI X-Received: by 2002:a17:902:9b8f:: with SMTP id y15-v6mr2227622plp.187.1527674353154; Wed, 30 May 2018 02:59:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527674353; cv=none; d=google.com; s=arc-20160816; b=MlWgZvBarjMdLoxRzfSYEeyAX+wtZRFT2O8iTIaU76eip6r2nT1FmYB7nG6vHaqyhM XlFM+Fm7veOEAKaXNo2JhfoIzQdkRqDTaW8Dk0lUU03OQHYm1Se+wHrrqZhCtNvafzqR 3vUtn4+mfipQvdTJ3d9CdowMLa+KE6dePaAIZi+MBCKw7UFVo6j7iXxBF/ADsMm4j10u Hed2jrvVqgztv5vTnPOzE0Yzzzv1Wm9UlD1bh+EM5EswozybXw9LXK0y95M2xztCC3Jq EcTFFKLzPbJdVeu3SM7CI8LPcUKnIq0sdAqz4c0/soNXuSckbbsR97Q11cddAGcKN2EG tJVg== 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=h8l4CoRBuvEp1v/MIU4ANAfHjNrZLHxXUgohw7zIfAI=; b=sadiHuwML04rtDJ7j/sO7q/XfTA2iJwBZIcuNaJ0SjJR6lDWHd08q5nIEByQLuIx0o z8/F+eYGDUfh7zlVrMg0VDJflvKLp0OjmbO3P99HI0KHfYvSN9hEBhKicwxr96yJiw+5 T7m2XPV44dIlVVof96Y7mk5FjzQtLdco9yDNGpIBc4nlCgJTqOBV9Plbn1zOak8qyr5i pDhvf3OvLnS3Ttre6zq5EWvkGpI/ERO4l/YjTCVFfS2TboQoXHA9dGlu+/fhRwGsB4r/ YCCCHsheDb7W5yXT3yqciQ2aIp0x1d1jUNVztQrrlAELOeYYsrGhUdpTidSI4iZQltIr 3mJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=tIp94NwA; 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 186-v6si34360065pfg.141.2018.05.30.02.59.13 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 02:59:13 -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=tIp94NwA; 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=h8l4CoRBuvEp1v/MIU4ANAfHjNrZLHxXUgohw7zIfAI=; b=tIp94NwAjfKkYI+JUxF6CFH7V +FOjCT4dwOUirBn3m5JEDO2X+JTDezN1I2EfcpxPNtrQfbV4oIuVW3IPIB+MCU9HvyQkap1ZhOU47 1IruWWTPGKCRmGhlSrOVASv/4pYNa+mQ1Tvrcit8pAL93TLRn232MuJIIbZipYDAmtNxGOhW6sKan p2SddOSMXfSIhT/RLGTuYbyqnUTcG7pthOAFGbGpNWjR+RDVG7jmrpz/Mea7up8XXezHqmELVUPvn +gPB93NZTRBWbAyOvzpPzCSLWo39uwv/FJRSOyZlH0p89SBtj1y0yzmwWXCom8hpgAl+IAR6JRCMW pQowDu2Pw==; 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 1fNxst-0006Zy-QE; Wed, 30 May 2018 09:59:12 +0000 From: Christoph Hellwig 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: Wed, 30 May 2018 11:58:13 +0200 Message-Id: <20180530095813.31245-14-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 For file systems with a block size that equals the page size we never do partial reads, so we can use the buffer_head-less iomap versions of readpage and readpages without conflicting with the buffer_head structures create later in write_begin. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/xfs/xfs_aops.c | 4 ++++ 1 file changed, 4 insertions(+) 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); }