From patchwork Mon Feb 17 19:20:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13978512 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 42281C021A9 for ; Mon, 17 Feb 2025 19:20:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BDD9C280090; Mon, 17 Feb 2025 14:20:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B8CF028008E; Mon, 17 Feb 2025 14:20:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A54E8280090; Mon, 17 Feb 2025 14:20:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 873F828008E for ; Mon, 17 Feb 2025 14:20:14 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 377C2A0E4A for ; Mon, 17 Feb 2025 19:20:14 +0000 (UTC) X-FDA: 83130402348.17.457F97A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf08.hostedemail.com (Postfix) with ESMTP id B423216000E for ; Mon, 17 Feb 2025 19:20:12 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=VbrNGmUQ; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739820012; a=rsa-sha256; cv=none; b=XG0lLDXpzBs9/+fNg0jo+Z5e/EulX81XbbY/zZqFkcrvkv+97M3XEEBGPJL4gZKAJ1SDsh 1Cbt3Ck48tQTxg5fM+vQTQLjyuKctt38nglLi+K+svQQUk4VWBa7Wy8b7SHRJpDilPx4xv 1MNaT9ip5ivc/Nwy6naWN41pXthZmzo= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=VbrNGmUQ; dmarc=none; spf=none (imf08.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739820012; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=bpxlu1VpRHaMCuJHYNJDFh9kAemaYJrHAe9o8N/mo/c=; b=UzpDSm/pJG93avHqa+Oz81juKpXKh1Gt4dq184FrExbjrsk4iWt7q8ExW4TMRe9BYVhMxW Q0P95UNSO64WvsML8z7BLhI2OvPdMXLa0YIDklNVEZCA9yNLG9CSHkfEqrg24mAAdQvUHz macUDedAMKHktK6LMC0L+fDgrx91DHg= 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: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=bpxlu1VpRHaMCuJHYNJDFh9kAemaYJrHAe9o8N/mo/c=; b=VbrNGmUQwJg+LP7rYf68pxYOP7 762/PVz7ngiEptNx0T5WinBj1kRXwhHh8wmrGbyg/kbzKKTJDIQ1Z7Kh4NbuQvu2FvITreeqOf7Q+ bIm76Xqg0S8LJ6m8Xhk4XhN/yBW24eJHqBJl8kSDPiYBmSahicSUQSspztL2bbkgF1ngSHOw6SgI7 xK39GDI7yBRZrdlCpgwL2suuWqsIQ3SBaNSQeY87Bg5GJx0p4s/IH2GsbkGBV9NiBcMMvmDO8KMP6 d/d53J9+3feSlnrN2FpSqMQ1hCyHn6ZSIHnYFYVXEPwddNrRuFS9BUsdTNv9feVqZ4DVQJrwD+2ub 3GYX6ZRQ==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tk6f5-00000001pvQ-1MFQ; Mon, 17 Feb 2025 19:20:11 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/3] fs: Convert block_commit_write() to take a folio Date: Mon, 17 Feb 2025 19:20:06 +0000 Message-ID: <20250217192009.437916-1-willy@infradead.org> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: B423216000E X-Rspamd-Server: rspam12 X-Stat-Signature: 3ym7djwngosowypyg4xg5ycssfpdneei X-HE-Tag: 1739820012-604867 X-HE-Meta: U2FsdGVkX18U5bpcDWBE3iERNQMjpsPXgoj9a5WMg7WtvhUfJ60fvIFFWn4yZiT1PWzw6iM/D2XI4X0gmqrxgRgGJA2FO/ivditRxA5y7oidCZvM0LGCVEERTHNj2YkOK5T8nddez6APSsK4B7DkjlGjDnwCGm47TE9eSyy2VUvuoZdPDGyu3fgpJoL+yFpoAah6DmPpISFGeAL82HPgPUCkx+3T2jvXwQdbffbBKmxDmCaFWOx863FLOcncD/K+6Jcre/NQzxmPI9T/0r9luSuVH1C5Z1yMM+i+NgT21LAyYnfmKOxvbNcIq0v7prv55OZvfKQMBdKrPtTVrQiwAgXihgKlv2aDd5KzoiUcWKykIxZFkjQhKZvgswcn1in7p61WRyLZ5Of+blQS9IBumYfxSDnD47sXHi02fgQ3wAT0NOwYRepJhshHjKu9LVRk2Vby/oP3GK80AS6On4Ee/MXWkI+TXu6NpahtUOzWXdUKMyxfLc3vb/J1luJuwOtJaYLsRWHD0MFIqvxygAG71/R58RtUgRAB1IRNq0OcszYaAYfQaoJk39KHA9ViYVkYWGzV89Xy/A7+DYV/gfOmsyh/Voa/he4NpGpx6YNW+3WGetDJRPT277RC/OtdVmHH/aHnwFZeZ+rKRyjtZqTxOTzk4un5HVgI05wMpKR9e8tDfKCuvC0YwTrEzQ3qwTr4I9Tu70dzak3Twwzpcc/z12Tnm2qUWb6iDofCPleNNFKLBxXMh4nGiXgll63ms5bQsuMR0Pj2kGnSpxVfSuudt5L7IggOB2hiW6CzUu9KbHJvfESSsyov9/1Slz51XIH3JW53Pu0GfMMWyMAPaVBmZf7x0siKijmJ0SmHd+fZwKnEG91rDrKEDwuA6obVaHnNzNGmXwHmvQu4h1HoEs3pMpifOxkkCdkmyIxK68160kGogiyragbLSZoE7Absep5M9OHSEwbDWNnpqAmRRvR KITyim9D yRfl+8wJiTkyOgmSVf7uyVWJwYSB2RZV0beUt1H0Psdh7DN+4cMXjyijpf4xmj3Hx/BS/OiVlN2k9NTAD6ekXRyux7o3GSzpFr4YPZeXh0QInUn6As/DMxGfod7Q6Zlf6MeoApg8Hn3pzp3wYZa49SpC7Imqt+YJS6fUiT7HmJAndNniOCEu5jtsC73NRXHOXVWl1P76+HgoCuUE621UWIqrKJSdHYcpIOyQt3oOmO2lo0Er4EzSZ7CJlTQsxokeTadpAUa5BXMZ/MePbDv1KNJO5TdUB12xFi+tW 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: List-Subscribe: List-Unsubscribe: All callers now have a folio, so pass it in instead of converting folio->page->folio. Signed-off-by: Matthew Wilcox (Oracle) --- fs/buffer.c | 14 ++++---------- fs/ext4/inline.c | 2 +- fs/ext4/move_extent.c | 2 +- fs/iomap/buffered-io.c | 2 +- fs/ocfs2/aops.c | 4 ++-- fs/ocfs2/file.c | 2 +- fs/udf/file.c | 2 +- include/linux/buffer_head.h | 2 +- 8 files changed, 12 insertions(+), 18 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index cc8452f60251..c66a59bb068b 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2166,7 +2166,7 @@ int __block_write_begin(struct folio *folio, loff_t pos, unsigned len, } EXPORT_SYMBOL(__block_write_begin); -static void __block_commit_write(struct folio *folio, size_t from, size_t to) +void block_commit_write(struct folio *folio, size_t from, size_t to) { size_t block_start, block_end; bool partial = false; @@ -2204,6 +2204,7 @@ static void __block_commit_write(struct folio *folio, size_t from, size_t to) if (!partial) folio_mark_uptodate(folio); } +EXPORT_SYMBOL(block_commit_write); /* * block_write_begin takes care of the basic task of block allocation and @@ -2262,7 +2263,7 @@ int block_write_end(struct file *file, struct address_space *mapping, flush_dcache_folio(folio); /* This could be a short (even 0-length) commit */ - __block_commit_write(folio, start, start + copied); + block_commit_write(folio, start, start + copied); return copied; } @@ -2578,13 +2579,6 @@ int cont_write_begin(struct file *file, struct address_space *mapping, } EXPORT_SYMBOL(cont_write_begin); -void block_commit_write(struct page *page, unsigned from, unsigned to) -{ - struct folio *folio = page_folio(page); - __block_commit_write(folio, from, to); -} -EXPORT_SYMBOL(block_commit_write); - /* * block_page_mkwrite() is not allowed to change the file size as it gets * called from a page fault handler when a page is first dirtied. Hence we must @@ -2630,7 +2624,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, if (unlikely(ret)) goto out_unlock; - __block_commit_write(folio, 0, end); + block_commit_write(folio, 0, end); folio_mark_dirty(folio); folio_wait_stable(folio); diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 3536ca7e4fcc..0af474c8b260 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -637,7 +637,7 @@ static int ext4_convert_inline_data_to_extent(struct address_space *mapping, goto retry; if (folio) - block_commit_write(&folio->page, from, to); + block_commit_write(folio, from, to); out: if (folio) { folio_unlock(folio); diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index 898443e98efc..48649be64d6a 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -399,7 +399,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, bh = bh->b_this_page; } - block_commit_write(&folio[0]->page, from, from + replaced_size); + block_commit_write(folio[0], from, from + replaced_size); /* Even in case of data=writeback it is reasonable to pin * inode to transaction, to prevent unexpected data loss */ diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index d303e6c8900c..f3904d13cda4 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1484,7 +1484,7 @@ static loff_t iomap_folio_mkwrite_iter(struct iomap_iter *iter, &iter->iomap); if (ret) return ret; - block_commit_write(&folio->page, 0, length); + block_commit_write(folio, 0, length); } else { WARN_ON_ONCE(!folio_test_uptodate(folio)); folio_mark_dirty(folio); diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 5bbeb6fbb1ac..ee1d92ed950f 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -920,7 +920,7 @@ static void ocfs2_write_failure(struct inode *inode, ocfs2_jbd2_inode_add_write(wc->w_handle, inode, user_pos, user_len); - block_commit_write(&folio->page, from, to); + block_commit_write(folio, from, to); } } } @@ -2012,7 +2012,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping, loff_t pos, ocfs2_jbd2_inode_add_write(handle, inode, start_byte, length); } - block_commit_write(&folio->page, from, to); + block_commit_write(folio, from, to); } } diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index e54f2c4b5a90..2056cf08ac1e 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -813,7 +813,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, /* must not update i_size! */ - block_commit_write(&folio->page, block_start + 1, block_start + 1); + block_commit_write(folio, block_start + 1, block_start + 1); } /* diff --git a/fs/udf/file.c b/fs/udf/file.c index 412fe7c4d348..0d76c4f37b3e 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -69,7 +69,7 @@ static vm_fault_t udf_page_mkwrite(struct vm_fault *vmf) goto out_unlock; } - block_commit_write(&folio->page, 0, end); + block_commit_write(folio, 0, end); out_dirty: folio_mark_dirty(folio); folio_wait_stable(folio); diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 932139c5d46f..6672e1a5031c 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -271,7 +271,7 @@ int cont_write_begin(struct file *, struct address_space *, loff_t, unsigned, struct folio **, void **, get_block_t *, loff_t *); int generic_cont_expand_simple(struct inode *inode, loff_t size); -void block_commit_write(struct page *page, unsigned int from, unsigned int to); +void block_commit_write(struct folio *folio, size_t from, size_t to); int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, get_block_t get_block); sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);