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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 906BFC433F5 for ; Mon, 14 Feb 2022 20:00:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D701A6B0087; Mon, 14 Feb 2022 15:00:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CD2166B0089; Mon, 14 Feb 2022 15:00:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B71506B008A; Mon, 14 Feb 2022 15:00:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0068.hostedemail.com [216.40.44.68]) by kanga.kvack.org (Postfix) with ESMTP id A643D6B0087 for ; Mon, 14 Feb 2022 15:00:27 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6AB64A309D for ; Mon, 14 Feb 2022 20:00:27 +0000 (UTC) X-FDA: 79142452494.19.0031A43 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id 0BD761C0012 for ; Mon, 14 Feb 2022 20:00:26 +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=WiTgwCpZh0ndnEs8kOFecZ3IKCNlndjktFda8Uy2FQ4=; b=cgLtrHe6t3lzJEhQu6o8tGcEWn MGNgWNkU+hwutl44v8OGi/mQoehoPKDWAQsrAeDG9UuR7Bafa+8zsicuevAs8upv4tw4ndYWb9l7v HOrJ30mlA77DQj5AvuDr4mOGsrne7OVwYRRkJdLPv4qe8G/7rvVk8OaLPQjJEBLnzrTRSnMAtmyN0 cImgIIw8dxzaFvn5k9TRZK6GkXnkaYkp62l07acmiyHjki2bxbPDbmeamzyEQE6inmahlnyBqoPjo UcGXpcsNInljX7wI8q3ExPjIoCT1z/MEcgXVk4FIAcKTz74Pq5xaBPG0XfUmLiIhsRSJ+7dP4updb 8+yjxVLA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nJhWF-00DDdU-C0; Mon, 14 Feb 2022 20:00:19 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 01/10] splice: Use a folio in page_cache_pipe_buf_try_steal() Date: Mon, 14 Feb 2022 20:00:08 +0000 Message-Id: <20220214200017.3150590-2-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220214200017.3150590-1-willy@infradead.org> References: <20220214200017.3150590-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=cgLtrHe6; spf=none (imf21.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam07 X-Rspam-User: X-Rspamd-Queue-Id: 0BD761C0012 X-Stat-Signature: 3hdtgu4td14fpa7ej67c69yhim6pqafm X-HE-Tag: 1644868826-893449 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: This saves a lot of calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- fs/splice.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 5dbce4dcc1a7..23ff9c303abc 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -47,26 +47,27 @@ static bool page_cache_pipe_buf_try_steal(struct pipe= _inode_info *pipe, struct pipe_buffer *buf) { struct page *page =3D buf->page; + struct folio *folio =3D page_folio(page); struct address_space *mapping; =20 - lock_page(page); + folio_lock(folio); =20 - mapping =3D page_mapping(page); + mapping =3D folio_mapping(folio); if (mapping) { - WARN_ON(!PageUptodate(page)); + WARN_ON(!folio_test_uptodate(folio)); =20 /* * At least for ext2 with nobh option, we need to wait on - * writeback completing on this page, since we'll remove it + * writeback completing on this folio, since we'll remove it * from the pagecache. Otherwise truncate wont wait on the - * page, allowing the disk blocks to be reused by someone else + * folio, allowing the disk blocks to be reused by someone else * before we actually wrote our data to them. fs corruption * ensues. */ - wait_on_page_writeback(page); + folio_wait_writeback(folio); =20 - if (page_has_private(page) && - !try_to_release_page(page, GFP_KERNEL)) + if (folio_has_private(folio) && + !filemap_release_folio(folio, GFP_KERNEL)) goto out_unlock; =20 /* @@ -80,11 +81,11 @@ static bool page_cache_pipe_buf_try_steal(struct pipe= _inode_info *pipe, } =20 /* - * Raced with truncate or failed to remove page from current + * Raced with truncate or failed to remove folio from current * address space, unlock and return failure. */ out_unlock: - unlock_page(page); + folio_unlock(folio); return false; } =20 --=20 2.34.1