This is a note to let you know that I've just added the patch titled
iomap: Fix iomap_invalidatepage tracepoint
to the 5.17-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:
iomap-fix-iomap_invalidatepage-tracepoint.patch
and it can be found in the queue-5.17 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 8f9b67c3d57e4cabb1f03a0e28a806b082cd683e
Author: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Date: Wed Feb 9 20:21:22 2022 +0000
iomap: Fix iomap_invalidatepage tracepoint
[ Upstream commit 1241ebeca3f94b417751cb3ff62454cefdac75bc ]
This tracepoint is defined to take an offset in the file, not an
offset in the folio.
Fixes: 1ac994525b9d ("iomap: Remove pgoff from tracepoints")
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Tested-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
Acked-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
Tested-by: Mike Marshall <hubcap@xxxxxxxxxxxx> # orangefs
Tested-by: David Howells <dhowells@xxxxxxxxxx> # afs
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 6c51a75d0be6..d020a2e81a24 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -480,7 +480,8 @@ EXPORT_SYMBOL_GPL(iomap_releasepage);
void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len)
{
- trace_iomap_invalidatepage(folio->mapping->host, offset, len);
+ trace_iomap_invalidatepage(folio->mapping->host,
+ folio_pos(folio) + offset, len);
/*
* If we're invalidating the entire folio, clear the dirty state
