From 23e3ce0eca992ab8a0a12f2a072823f3bb7e000e Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Wed, 13 Apr 2022 23:06:53 -0700 Subject: [PATCH] mm/munlock: remove fields to fix htmldocs warnings Stephen reports that 'make htmldocs' currently issues two warnings: include/linux/mm_types.h:275: warning: Function parameter or member '__filler' not described in 'folio' include/linux/mm_types.h:275: warning: Function parameter or member 'mlock_count' not described in 'folio' Certainly __filler doesn't want documenting there, and all but one use of mlock_count is through page->mlock_count at present: so I think it's best just to remove them both from struct folio for now, and sort out the right way to document folio->mlock_count once that is the one true way. Link: https://lkml.kernel.org/r/d2c8f66d-be8e-7c91-b0c8-b2f7ffb08bec@google.com Fixes: 07ca76067308 ("mm/munlock: maintain page->mlock_count while unevictable") Signed-off-by: Hugh Dickins Reported-by: Stephen Rothwell Cc: Matthew Wilcox Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- include/linux/mm_types.h | 8 +------- mm/swap.c | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 8834e38c06a4..444fe386a1db 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -253,13 +253,7 @@ struct folio { struct { /* public: */ unsigned long flags; - union { - struct list_head lru; - struct { - void *__filler; - unsigned int mlock_count; - }; - }; + struct list_head lru; struct address_space *mapping; pgoff_t index; void *private; diff --git a/mm/swap.c b/mm/swap.c index 7e320ec08c6a..fa3b48646976 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -1028,13 +1028,13 @@ static void __pagevec_lru_add_fn(struct folio *folio, struct lruvec *lruvec) folio_clear_active(folio); folio_set_unevictable(folio); /* - * folio->mlock_count = !!folio_test_mlocked(folio)? + * page->mlock_count = !!PageMlocked(page)? * But that leaves __mlock_page() in doubt whether another * actor has already counted the mlock or not. Err on the * safe side, underestimate, let page reclaim fix it, rather * than leaving a page on the unevictable LRU indefinitely. */ - folio->mlock_count = 0; + folio_page(folio, 0)->mlock_count = 0; if (!was_unevictable) __count_vm_events(UNEVICTABLE_PGCULLED, nr_pages); } -- 2.50.1