From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org, willy@infradead.org, tytso@mit.edu,
hughd@google.com, hch@lst.de, hch@infradead.org,
adilger.kernel@dilger.ca, sidhartha.kumar@oracle.com,
akpm@linux-foundation.org
Subject: [merged mm-stable] mm-increase-usage-of-folio_next_index-helper.patch removed from -mm tree
Date: Fri, 11 Aug 2023 15:58:27 -0700 [thread overview]
Message-ID: <20230811225827.EF1B0C433C8@smtp.kernel.org> (raw)
The quilt patch titled
Subject: mm: increase usage of folio_next_index() helper
has been removed from the -mm tree. Its filename was
mm-increase-usage-of-folio_next_index-helper.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: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: mm: increase usage of folio_next_index() helper
Date: Tue, 27 Jun 2023 10:43:49 -0700
Simplify code pattern of 'folio->index + folio_nr_pages(folio)' by using
the existing helper folio_next_index().
Link: https://lkml.kernel.org/r/20230627174349.491803-1-sidhartha.kumar@oracle.com
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Suggested-by: Christoph Hellwig <hch@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/ext4/inode.c | 4 ++--
mm/filemap.c | 8 ++++----
mm/memory.c | 2 +-
mm/shmem.c | 2 +-
mm/truncate.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
--- a/fs/ext4/inode.c~mm-increase-usage-of-folio_next_index-helper
+++ a/fs/ext4/inode.c
@@ -1569,7 +1569,7 @@ static void mpage_release_unused_pages(s
if (folio->index < mpd->first_page)
continue;
- if (folio->index + folio_nr_pages(folio) - 1 > end)
+ if (folio_next_index(folio) - 1 > end)
continue;
BUG_ON(!folio_test_locked(folio));
BUG_ON(folio_test_writeback(folio));
@@ -2455,7 +2455,7 @@ static int mpage_prepare_extent_to_map(s
if (mpd->map.m_len == 0)
mpd->first_page = folio->index;
- mpd->next_page = folio->index + folio_nr_pages(folio);
+ mpd->next_page = folio_next_index(folio);
/*
* Writeout when we cannot modify metadata is simple.
* Just submit the page. For data=journal mode we
--- a/mm/filemap.c~mm-increase-usage-of-folio_next_index-helper
+++ a/mm/filemap.c
@@ -2075,7 +2075,7 @@ unsigned find_lock_entries(struct addres
if (!xa_is_value(folio)) {
if (folio->index < *start)
goto put;
- if (folio->index + folio_nr_pages(folio) - 1 > end)
+ if (folio_next_index(folio) - 1 > end)
goto put;
if (!folio_trylock(folio))
goto put;
@@ -2174,7 +2174,7 @@ bool folio_more_pages(struct folio *foli
return false;
if (index >= max)
return false;
- return index < folio->index + folio_nr_pages(folio) - 1;
+ return index < folio_next_index(folio) - 1;
}
/**
@@ -2242,7 +2242,7 @@ update_start:
if (folio_test_hugetlb(folio))
*start = folio->index + 1;
else
- *start = folio->index + folio_nr_pages(folio);
+ *start = folio_next_index(folio);
}
out:
rcu_read_unlock();
@@ -2359,7 +2359,7 @@ static void filemap_get_read_batch(struc
break;
if (folio_test_readahead(folio))
break;
- xas_advance(&xas, folio->index + folio_nr_pages(folio) - 1);
+ xas_advance(&xas, folio_next_index(folio) - 1);
continue;
put_folio:
folio_put(folio);
--- a/mm/memory.c~mm-increase-usage-of-folio_next_index-helper
+++ a/mm/memory.c
@@ -3495,7 +3495,7 @@ void unmap_mapping_folio(struct folio *f
VM_BUG_ON(!folio_test_locked(folio));
first_index = folio->index;
- last_index = folio->index + folio_nr_pages(folio) - 1;
+ last_index = folio_next_index(folio) - 1;
details.even_cows = false;
details.single_folio = folio;
--- a/mm/shmem.c~mm-increase-usage-of-folio_next_index-helper
+++ a/mm/shmem.c
@@ -970,7 +970,7 @@ static void shmem_undo_range(struct inod
same_folio = lend < folio_pos(folio) + folio_size(folio);
folio_mark_dirty(folio);
if (!truncate_inode_partial_folio(folio, lstart, lend)) {
- start = folio->index + folio_nr_pages(folio);
+ start = folio_next_index(folio);
if (same_folio)
end = folio->index;
}
--- a/mm/truncate.c~mm-increase-usage-of-folio_next_index-helper
+++ a/mm/truncate.c
@@ -378,7 +378,7 @@ void truncate_inode_pages_range(struct a
if (!IS_ERR(folio)) {
same_folio = lend < folio_pos(folio) + folio_size(folio);
if (!truncate_inode_partial_folio(folio, lstart, lend)) {
- start = folio->index + folio_nr_pages(folio);
+ start = folio_next_index(folio);
if (same_folio)
end = folio->index;
}
_
Patches currently in -mm which might be from sidhartha.kumar@oracle.com are
reply other threads:[~2023-08-11 22:58 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=20230811225827.EF1B0C433C8@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=adilger.kernel@dilger.ca \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=sidhartha.kumar@oracle.com \
--cc=tytso@mit.edu \
--cc=willy@infradead.org \
/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.