From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, willy@infradead.org,
tsahu@linux.ibm.com, aneesh.kumar@linux.ibm.com,
Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH] mm: remove set_compound_page_dtor()
Date: Mon, 12 Jun 2023 09:34:05 -0700 [thread overview]
Message-ID: <20230612163405.99345-1-sidhartha.kumar@oracle.com> (raw)
All users can use the folio equivalent so this function can be safely
removed.
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
rebased on 06/12/23 mm-unstable + Tarun's patch[1]
[1]: https://lore.kernel.org/linux-mm/20230612093514.689846-1-tsahu@linux.ibm.com/
include/linux/mm.h | 10 ----------
mm/huge_memory.c | 2 +-
mm/internal.h | 2 +-
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 4a1aec5e4b83c..485224cd62ffb 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1223,16 +1223,6 @@ enum compound_dtor_id {
};
extern compound_page_dtor * const compound_page_dtors[NR_COMPOUND_DTORS];
-static inline void set_compound_page_dtor(struct page *page,
- enum compound_dtor_id compound_dtor)
-{
- struct folio *folio = (struct folio *)page;
-
- VM_BUG_ON_PAGE(compound_dtor >= NR_COMPOUND_DTORS, page);
- VM_BUG_ON_PAGE(!PageHead(page), page);
- folio->_folio_dtor = compound_dtor;
-}
-
static inline void folio_set_compound_dtor(struct folio *folio,
enum compound_dtor_id compound_dtor)
{
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 31bc8fa768e3d..76f970aa5b4da 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -583,7 +583,7 @@ void prep_transhuge_page(struct page *page)
VM_BUG_ON_FOLIO(folio_order(folio) < 2, folio);
INIT_LIST_HEAD(&folio->_deferred_list);
- set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR);
+ folio_set_compound_dtor(folio, TRANSHUGE_PAGE_DTOR);
}
static inline bool is_transparent_hugepage(struct page *page)
diff --git a/mm/internal.h b/mm/internal.h
index 61acceface45f..a64967bfcd2ab 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -406,7 +406,7 @@ static inline void prep_compound_head(struct page *page, unsigned int order)
{
struct folio *folio = (struct folio *)page;
- set_compound_page_dtor(page, COMPOUND_PAGE_DTOR);
+ folio_set_compound_dtor(folio, COMPOUND_PAGE_DTOR);
folio_set_order(folio, order);
atomic_set(&folio->_entire_mapcount, -1);
atomic_set(&folio->_nr_pages_mapped, 0);
--
2.40.1
next reply other threads:[~2023-06-12 16:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 16:34 Sidhartha Kumar [this message]
2023-06-12 17:28 ` [PATCH] mm: remove set_compound_page_dtor() Tarun Sahu
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=20230612163405.99345-1-sidhartha.kumar@oracle.com \
--to=sidhartha.kumar@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=tsahu@linux.ibm.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).