From: Jiaqi Yan <jiaqiyan@google.com>
To: jane.chu@oracle.com, muchun.song@linux.dev, david@kernel.org
Cc: akpm@linux-foundation.org, osalvador@suse.de,
william.roche@oracle.com, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Jiaqi Yan <jiaqiyan@google.com>
Subject: [PATCH v2] fs: hugetlb: simplify remove_inode_hugepages() return type
Date: Wed, 4 Feb 2026 21:47:41 +0000 [thread overview]
Message-ID: <20260204214741.3161520-1-jiaqiyan@google.com> (raw)
When remove_inode_hugepages is introduced in
commit c86272287bc6 ("hugetlb: create remove_inode_single_folio to remove single file folio")
it used to return a boolean to indicate if it bailed out due to race with
page faults. However, since the race is already solved by [1],
remove_inode_hugepages() doesn't have any path to return false anymore.
Simplify remove_inode_hugepages() return type to void, remove the
unnecessary ret variable, and adjust the call site in
remove_inode_hugepages(). No functional change in this commit.
Changelog
=========
v2 -> v1 [2]
- Use two-tab alignment for parameters wrapped to new lines.
- Remove return type in remove_inode_hugepages()'s comment.
[1] https://lore.kernel.org/all/20220914221810.95771-10-mike.kravetz@oracle.com
[2] https://lore.kernel.org/linux-mm/20260202233617.2350734-1-jiaqiyan@google.com
Suggested-by: Jane Chu <jane.chu@oracle.com>
Reviewed-by: Jane Chu <jane.chu@oracle.com>
Reviewed-by: Muchun Song <muchun.song@linux.dev>
Acked-by: David Hildenbrand (arm) <david@kernel.org>
Signed-off-by: Jiaqi Yan <jiaqiyan@google.com>
---
fs/hugetlbfs/inode.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 3b4c152c5c73a..09c88c09718b4 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -513,15 +513,11 @@ hugetlb_vmdelete_list(struct rb_root_cached *root, pgoff_t start, pgoff_t end,
/*
* Called with hugetlb fault mutex held.
- * Returns true if page was actually removed, false otherwise.
*/
-static bool remove_inode_single_folio(struct hstate *h, struct inode *inode,
- struct address_space *mapping,
- struct folio *folio, pgoff_t index,
- bool truncate_op)
+static void remove_inode_single_folio(struct hstate *h, struct inode *inode,
+ struct address_space *mapping, struct folio *folio,
+ pgoff_t index, bool truncate_op)
{
- bool ret = false;
-
/*
* If folio is mapped, it was faulted in after being
* unmapped in caller or hugetlb_vmdelete_list() skips
@@ -543,7 +539,6 @@ static bool remove_inode_single_folio(struct hstate *h, struct inode *inode,
*/
VM_BUG_ON_FOLIO(folio_test_hugetlb_restore_reserve(folio), folio);
hugetlb_delete_from_page_cache(folio);
- ret = true;
if (!truncate_op) {
if (unlikely(hugetlb_unreserve_pages(inode, index,
index + 1, 1)))
@@ -551,7 +546,6 @@ static bool remove_inode_single_folio(struct hstate *h, struct inode *inode,
}
folio_unlock(folio);
- return ret;
}
/*
@@ -599,9 +593,9 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
/*
* Remove folio that was part of folio_batch.
*/
- if (remove_inode_single_folio(h, inode, mapping, folio,
- index, truncate_op))
- freed++;
+ remove_inode_single_folio(h, inode, mapping, folio,
+ index, truncate_op);
+ freed++;
mutex_unlock(&hugetlb_fault_mutex_table[hash]);
}
--
2.53.0.rc2.204.g2597b5adb4-goog
next reply other threads:[~2026-02-04 21:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-04 21:47 Jiaqi Yan [this message]
2026-02-04 21:54 ` David Hildenbrand (arm)
2026-02-04 22:44 ` Andrew Morton
2026-02-05 1:13 ` SeongJae Park
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=20260204214741.3161520-1-jiaqiyan@google.com \
--to=jiaqiyan@google.com \
--cc=akpm@linux-foundation.org \
--cc=david@kernel.org \
--cc=jane.chu@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=muchun.song@linux.dev \
--cc=osalvador@suse.de \
--cc=william.roche@oracle.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox