From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 083B6C433B4 for ; Wed, 5 May 2021 17:31:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 927A761004 for ; Wed, 5 May 2021 17:31:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 927A761004 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2B8296B0070; Wed, 5 May 2021 13:31:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 28F256B0071; Wed, 5 May 2021 13:31:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 157346B0072; Wed, 5 May 2021 13:31:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0110.hostedemail.com [216.40.44.110]) by kanga.kvack.org (Postfix) with ESMTP id F15B86B0070 for ; Wed, 5 May 2021 13:31:47 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B14C1180AD837 for ; Wed, 5 May 2021 17:31:47 +0000 (UTC) X-FDA: 78107869854.06.2C70B1D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf26.hostedemail.com (Postfix) with ESMTP id BF2DA4080F51 for ; Wed, 5 May 2021 17:31:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=p6iosGLR08SJeU1mGDyhL68o4poF65QYXoPTjkLYh+s=; b=KeEgjEgQcyA3Linp3/87Ogtx1E LgoSxF2YYaK5f7kVrnIdJ9tmaW3LRYdzuDv+FErBGBp8VyPZul/cfsywvtoDegq0LsQ8SYyDYi9hc xAryH+z2eJQ7/WByBFu5naJlh8opxOX26fhjQGSUxzdMESlKb2Hxi4CtNoa7yQWSo2qsSj6KzjoU5 OvYC3MCSoN82QupyjGY/6DNWaWJCQIEoU4X7Fpz45ZnhYwUn7WIT4HvRNXqPqAQse/JO8KT8KT/sc dcWMV2WJS1WvUmu1hVicyE3DA9/UpMQ+e9rJjwi3XGrRmuYIFigL0OJ4JxNh4c5P6yeHGgE7OxfXA v8EIvHUQ==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1leLLY-000eYZ-00; Wed, 05 May 2021 17:30:23 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v9 93/96] iomap: Convert iomap_read_inline_data to take a folio Date: Wed, 5 May 2021 16:06:25 +0100 Message-Id: <20210505150628.111735-94-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210505150628.111735-1-willy@infradead.org> References: <20210505150628.111735-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: BF2DA4080F51 X-Stat-Signature: upis43w8p743birkjz3dbka8qpsa33cd Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=KeEgjEgQ; spf=none (imf26.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf26; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620235895-202345 Content-Transfer-Encoding: quoted-printable 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: Inline data is restricted to being less than a page in size, so we don't need to handle multi-page folios. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 1c7e16e6aad1..72fe6741a36c 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -194,24 +194,24 @@ struct iomap_readpage_ctx { struct readahead_control *rac; }; =20 -static void -iomap_read_inline_data(struct inode *inode, struct page *page, +static void iomap_read_inline_data(struct inode *inode, struct folio *fo= lio, struct iomap *iomap) { size_t size =3D i_size_read(inode); void *addr; =20 - if (PageUptodate(page)) + if (folio_uptodate(folio)) return; =20 - BUG_ON(page->index); + BUG_ON(folio->index); + BUG_ON(folio_multi(folio)); BUG_ON(size > PAGE_SIZE - offset_in_page(iomap->inline_data)); =20 - addr =3D kmap_atomic(page); + addr =3D kmap_local_folio(folio, 0); memcpy(addr, iomap->inline_data, size); memset(addr + size, 0, PAGE_SIZE - size); - kunmap_atomic(addr); - SetPageUptodate(page); + kunmap_local(addr); + folio_mark_uptodate(folio); } =20 static inline bool iomap_block_needs_zeroing(struct inode *inode, @@ -236,7 +236,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, =20 if (iomap->type =3D=3D IOMAP_INLINE) { WARN_ON_ONCE(pos); - iomap_read_inline_data(inode, &folio->page, iomap); + iomap_read_inline_data(inode, folio, iomap); return PAGE_SIZE; } =20 @@ -614,7 +614,7 @@ static int iomap_write_begin(struct inode *inode, lof= f_t pos, size_t len, =20 page =3D folio_file_page(folio, pos >> PAGE_SHIFT); if (srcmap->type =3D=3D IOMAP_INLINE) - iomap_read_inline_data(inode, page, srcmap); + iomap_read_inline_data(inode, folio, srcmap); else if (iomap->flags & IOMAP_F_BUFFER_HEAD) status =3D __block_write_begin_int(page, pos, len, NULL, srcmap); else --=20 2.30.2