Skip to contentSkip to conversation

readahead-drop-pointless-index-from-force_page_cache_ra.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 pointless index from force_page_cache_ra()
has been removed from the -mm tree. Its filename was
readahead-drop-pointless-index-from-force_page_cache_ra.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 pointless index from force_page_cache_ra()
Date: Tue, 25 Jun 2024 12:18:54 +0200

Current index to readahead is tracked in readahead_control and properly updated by page_cache_ra_unbounded() (read_pages() in fact). So there's no need to track the index separately in force_page_cache_ra().

---

 mm/readahead.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
mm/readahead.c renamed from mm/readahead.c~readahead-drop-pointless-index-from-force_page_cache_ra +1 -4
@@ -313,7 +313,7 @@ void force_page_cache_ra(struct readahea
 	struct address_space *mapping = ractl->mapping;
 	struct file_ra_state *ra = ractl->ra;
 	struct backing_dev_info *bdi = inode_to_bdi(mapping->host);
-	unsigned long max_pages, index;
+	unsigned long max_pages;
 
 	if (unlikely(!mapping->a_ops->read_folio && !mapping->a_ops->readahead))
 		return;
@@ -322,7 +322,6 @@ void force_page_cache_ra(struct readahea
 	 * If the request exceeds the readahead window, allow the read to
 	 * be up to the optimal hardware IO size
 	 */
-	index = readahead_index(ractl);
 	max_pages = max_t(unsigned long, bdi->io_pages, ra->ra_pages);
 	nr_to_read = min_t(unsigned long, nr_to_read, max_pages);
 	while (nr_to_read) {
@@ -330,10 +329,8 @@ void force_page_cache_ra(struct readahea
 
 		if (this_chunk > nr_to_read)
 			this_chunk = nr_to_read;
-		ractl->_index = index;
 		do_page_cache_ra(ractl, this_chunk, 0);
 
-		index += this_chunk;
 		nr_to_read -= this_chunk;
 	}
 }

_

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