From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,ziy@nvidia.com,willy@infradead.org,ljs@kernel.org,jack@suse.cz,david@kernel.org,chrisl@kernel.org,brauner@kernel.org,tz2294@columbia.edu,akpm@linux-foundation.org
Subject: [merged mm-stable] folio_batch-rename-pagevec_size-to-folio_batch_size.patch removed from -mm tree
Date: Tue, 24 Mar 2026 14:43:45 -0700 [thread overview]
Message-ID: <20260324214346.126BFC19424@smtp.kernel.org> (raw)
The quilt patch titled
Subject: folio_batch: rename PAGEVEC_SIZE to FOLIO_BATCH_SIZE
has been removed from the -mm tree. Its filename was
folio_batch-rename-pagevec_size-to-folio_batch_size.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: Tal Zussman <tz2294@columbia.edu>
Subject: folio_batch: rename PAGEVEC_SIZE to FOLIO_BATCH_SIZE
Date: Wed, 25 Feb 2026 18:44:28 -0500
struct pagevec no longer exists. Rename the macro appropriately.
Link: https://lkml.kernel.org/r/20260225-pagevec_cleanup-v2-4-716868cc2d11@columbia.edu
Signed-off-by: Tal Zussman <tz2294@columbia.edu>
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Acked-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Cc: Chris Li <chrisl@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/btrfs/extent_io.c | 4 ++--
include/linux/folio_batch.h | 6 +++---
include/linux/folio_queue.h | 6 +++---
mm/shmem.c | 4 ++--
mm/swap.c | 2 +-
mm/swap_state.c | 2 +-
mm/truncate.c | 6 +++---
7 files changed, 15 insertions(+), 15 deletions(-)
--- a/fs/btrfs/extent_io.c~folio_batch-rename-pagevec_size-to-folio_batch_size
+++ a/fs/btrfs/extent_io.c
@@ -2095,13 +2095,13 @@ static void buffer_tree_tag_for_writebac
struct eb_batch {
unsigned int nr;
unsigned int cur;
- struct extent_buffer *ebs[PAGEVEC_SIZE];
+ struct extent_buffer *ebs[FOLIO_BATCH_SIZE];
};
static inline bool eb_batch_add(struct eb_batch *batch, struct extent_buffer *eb)
{
batch->ebs[batch->nr++] = eb;
- return (batch->nr < PAGEVEC_SIZE);
+ return (batch->nr < FOLIO_BATCH_SIZE);
}
static inline void eb_batch_init(struct eb_batch *batch)
--- a/include/linux/folio_batch.h~folio_batch-rename-pagevec_size-to-folio_batch_size
+++ a/include/linux/folio_batch.h
@@ -12,7 +12,7 @@
#include <linux/types.h>
/* 31 pointers + header align the folio_batch structure to a power of two */
-#define PAGEVEC_SIZE 31
+#define FOLIO_BATCH_SIZE 31
struct folio;
@@ -29,7 +29,7 @@ struct folio_batch {
unsigned char nr;
unsigned char i;
bool percpu_pvec_drained;
- struct folio *folios[PAGEVEC_SIZE];
+ struct folio *folios[FOLIO_BATCH_SIZE];
};
/**
@@ -58,7 +58,7 @@ static inline unsigned int folio_batch_c
static inline unsigned int folio_batch_space(const struct folio_batch *fbatch)
{
- return PAGEVEC_SIZE - fbatch->nr;
+ return FOLIO_BATCH_SIZE - fbatch->nr;
}
/**
--- a/include/linux/folio_queue.h~folio_batch-rename-pagevec_size-to-folio_batch_size
+++ a/include/linux/folio_queue.h
@@ -29,12 +29,12 @@
*/
struct folio_queue {
struct folio_batch vec; /* Folios in the queue segment */
- u8 orders[PAGEVEC_SIZE]; /* Order of each folio */
+ u8 orders[FOLIO_BATCH_SIZE]; /* Order of each folio */
struct folio_queue *next; /* Next queue segment or NULL */
struct folio_queue *prev; /* Previous queue segment of NULL */
unsigned long marks; /* 1-bit mark per folio */
unsigned long marks2; /* Second 1-bit mark per folio */
-#if PAGEVEC_SIZE > BITS_PER_LONG
+#if FOLIO_BATCH_SIZE > BITS_PER_LONG
#error marks is not big enough
#endif
unsigned int rreq_id;
@@ -70,7 +70,7 @@ static inline void folioq_init(struct fo
*/
static inline unsigned int folioq_nr_slots(const struct folio_queue *folioq)
{
- return PAGEVEC_SIZE;
+ return FOLIO_BATCH_SIZE;
}
/**
--- a/mm/shmem.c~folio_batch-rename-pagevec_size-to-folio_batch_size
+++ a/mm/shmem.c
@@ -1113,7 +1113,7 @@ static void shmem_undo_range(struct inod
pgoff_t start = (lstart + PAGE_SIZE - 1) >> PAGE_SHIFT;
pgoff_t end = (lend + 1) >> PAGE_SHIFT;
struct folio_batch fbatch;
- pgoff_t indices[PAGEVEC_SIZE];
+ pgoff_t indices[FOLIO_BATCH_SIZE];
struct folio *folio;
bool same_folio;
long nr_swaps_freed = 0;
@@ -1510,7 +1510,7 @@ static int shmem_unuse_inode(struct inod
struct address_space *mapping = inode->i_mapping;
pgoff_t start = 0;
struct folio_batch fbatch;
- pgoff_t indices[PAGEVEC_SIZE];
+ pgoff_t indices[FOLIO_BATCH_SIZE];
int ret = 0;
do {
--- a/mm/swap.c~folio_batch-rename-pagevec_size-to-folio_batch_size
+++ a/mm/swap.c
@@ -1018,7 +1018,7 @@ EXPORT_SYMBOL(folios_put_refs);
void release_pages(release_pages_arg arg, int nr)
{
struct folio_batch fbatch;
- int refs[PAGEVEC_SIZE];
+ int refs[FOLIO_BATCH_SIZE];
struct encoded_page **encoded = arg.encoded_pages;
int i;
--- a/mm/swap_state.c~folio_batch-rename-pagevec_size-to-folio_batch_size
+++ a/mm/swap_state.c
@@ -385,7 +385,7 @@ void free_folio_and_swap_cache(struct fo
void free_pages_and_swap_cache(struct encoded_page **pages, int nr)
{
struct folio_batch folios;
- unsigned int refs[PAGEVEC_SIZE];
+ unsigned int refs[FOLIO_BATCH_SIZE];
folio_batch_init(&folios);
for (int i = 0; i < nr; i++) {
--- a/mm/truncate.c~folio_batch-rename-pagevec_size-to-folio_batch_size
+++ a/mm/truncate.c
@@ -369,7 +369,7 @@ void truncate_inode_pages_range(struct a
pgoff_t start; /* inclusive */
pgoff_t end; /* exclusive */
struct folio_batch fbatch;
- pgoff_t indices[PAGEVEC_SIZE];
+ pgoff_t indices[FOLIO_BATCH_SIZE];
pgoff_t index;
int i;
struct folio *folio;
@@ -534,7 +534,7 @@ EXPORT_SYMBOL(truncate_inode_pages_final
unsigned long mapping_try_invalidate(struct address_space *mapping,
pgoff_t start, pgoff_t end, unsigned long *nr_failed)
{
- pgoff_t indices[PAGEVEC_SIZE];
+ pgoff_t indices[FOLIO_BATCH_SIZE];
struct folio_batch fbatch;
pgoff_t index = start;
unsigned long ret;
@@ -672,7 +672,7 @@ failed:
int invalidate_inode_pages2_range(struct address_space *mapping,
pgoff_t start, pgoff_t end)
{
- pgoff_t indices[PAGEVEC_SIZE];
+ pgoff_t indices[FOLIO_BATCH_SIZE];
struct folio_batch fbatch;
pgoff_t index;
int i;
_
Patches currently in -mm which might be from tz2294@columbia.edu are
reply other threads:[~2026-03-24 21:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260324214346.126BFC19424@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=chrisl@kernel.org \
--cc=david@kernel.org \
--cc=jack@suse.cz \
--cc=ljs@kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=tz2294@columbia.edu \
--cc=willy@infradead.org \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.