Skip to contentSkip to conversation

readahead-drop-index-argument-of-page_cache_async_readahead.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 29, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: readahead: drop index argument of page_cache_async_readahead()
has been removed from the -mm tree. Its filename was
readahead-drop-index-argument-of-page_cache_async_readahead.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Jan Kara <[email protected]>
Subject: readahead: drop index argument of page_cache_async_readahead()
Date: Tue, 25 Jun 2024 12:18:55 +0200

The index argument of page_cache_async_readahead() is just folio->index so there's no point in passing is separately. Drop it.

---

 fs/btrfs/relocation.c   |    3 +--
 fs/btrfs/send.c         |    2 +-
 include/linux/pagemap.h |    7 +++----
 3 files changed, 5 insertions(+), 7 deletions(-)
fs/btrfs/relocation.c renamed from fs/btrfs/relocation.c~readahead-drop-index-argument-of-page_cache_async_readahead +1 -2
@@ -2975,8 +2975,7 @@ static int relocate_one_folio(struct ino
 
 	if (folio_test_readahead(folio))
 		page_cache_async_readahead(inode->i_mapping, ra, NULL,
-					   folio, index,
-					   last_index + 1 - index);
+					   folio, last_index + 1 - index);
 
 	if (!folio_test_uptodate(folio)) {
 		btrfs_read_folio(NULL, folio);
fs/btrfs/send.c renamed from fs/btrfs/send.c~readahead-drop-index-argument-of-page_cache_async_readahead +1 -1
@@ -5307,7 +5307,7 @@ static int put_file_data(struct send_ctx
 
 		if (folio_test_readahead(folio))
 			page_cache_async_readahead(mapping, &sctx->ra, NULL, folio,
-						   index, last_index + 1 - index);
+						   last_index + 1 - index);
 
 		if (!folio_test_uptodate(folio)) {
 			btrfs_read_folio(NULL, folio);
include/linux/pagemap.h renamed from include/linux/pagemap.h~readahead-drop-index-argument-of-page_cache_async_readahead +3 -4
@@ -1293,8 +1293,7 @@ void page_cache_sync_readahead(struct ad
  * @mapping: address_space which holds the pagecache and I/O vectors
  * @ra: file_ra_state which holds the readahead state
  * @file: Used by the filesystem for authentication.
- * @folio: The folio at @index which triggered the readahead call.
- * @index: Index of first page to be read.
+ * @folio: The folio which triggered the readahead call.
  * @req_count: Total number of pages being read by the caller.
  *
  * page_cache_async_readahead() should be called when a page is used which
@@ -1305,9 +1304,9 @@ void page_cache_sync_readahead(struct ad
 static inline
 void page_cache_async_readahead(struct address_space *mapping,
 		struct file_ra_state *ra, struct file *file,
-		struct folio *folio, pgoff_t index, unsigned long req_count)
+		struct folio *folio, unsigned long req_count)
 {
-	DEFINE_READAHEAD(ractl, file, ra, mapping, index);
+	DEFINE_READAHEAD(ractl, file, ra, mapping, folio->index);
 	page_cache_async_ra(&ractl, folio, req_count);
 }
 

_

Patches currently in -mm which might be from [email protected] are