Patch "netfs, ceph: Partially revert "netfs: Replace PG_fscache by setting folio->private and marking dirty"" has been added to the 6.10-stable tree
Subsystems (3)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
netfs, ceph: Partially revert "netfs: Replace PG_fscache by setting folio->private and marking dirty"
to the 6.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfs-ceph-partially-revert-netfs-replace-pg_fscache-by-setting-folio-private-and-marking-dirty.patch
and it can be found in the queue-6.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From 92764e8822d4e7f8efb5ad959fac195a7f8ea0c6 Mon Sep 17 00:00:00 2001
From: David Howells <[email protected]>
Date: Wed, 14 Aug 2024 21:38:21 +0100
Subject: netfs, ceph: Partially revert "netfs: Replace PG_fscache by setting folio->private and marking dirty"
From: David Howells <[email protected]>
commit 92764e8822d4e7f8efb5ad959fac195a7f8ea0c6 upstream.
This partially reverts commit 2ff1e97587f4d398686f52c07afde3faf3da4e5c.
In addition to reverting the removal of PG_private_2 wrangling from the buffered read code[1][2], the removal of the waits for PG_private_2 from netfs_release_folio() and netfs_invalidate_folio() need reverting too.
It also adds a wait into ceph_evict_inode() to wait for netfs read and copy-to-cache ops to complete.
--- fs/ceph/inode.c | 1 + fs/netfs/misc.c | 7 +++++++ 2 files changed, 8 insertions(+)
fs/ceph/inode.c +1 -0
@@ -697,6 +697,7 @@ void ceph_evict_inode(struct inode *inodpercpu_counter_dec (&mdsc->metric.total_inodes); +netfs_wait_for_outstanding_io (inode);truncate_inode_pages_final (&inode->i_data);if (inode->i_state &I_PINNING_NETFS_WB )ceph_fscache_unuse_cookie (inode, true);
fs/netfs/misc.c +7 -0
@@ -101,6 +101,8 @@ void netfs_invalidate_folio(struct foliokenter ("{%lx},%zx,%zx" , folio->index, offset, length); +folio_wait_private_2 (folio);/* [DEPRECATED] */ +if (!folio_test_private (folio))return ;
@@ -165,6 +167,11 @@ bool netfs_release_folio(struct folio *fif (folio_test_private (folio))return false; +if (unlikely (folio_test_private_2 (folio))) {/* [DEPRECATED] */ +if (current_is_kswapd () || !(gfp & __GFP_FS)) +return false; +folio_wait_private_2 (folio); + }fscache_note_page_release (netfs_i_cookie (ctx));return true; }
Patches currently in stable-queue which might be from [email protected] are
queue-6.10/smb-client-avoid-dereferencing-rdata-null-in-smb2_new_read_req.patch queue-6.10/netfs-ceph-partially-revert-netfs-replace-pg_fscache-by-setting-folio-private-and-marking-dirty.patch