From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, songmuchun@bytedance.com,
mike.kravetz@oracle.com, willy@infradead.org, vbabka@suse.cz,
william.kucharski@oracle.com, dhowells@redhat.com,
peterx@redhat.com, arnd@arndb.de, ccross@google.com,
hughd@google.com, ebiederm@xmission.com,
Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 5/6] hugetlbfs: convert hugetlb_delete_from_page_cache() to use folios
Date: Tue, 6 Sep 2022 09:54:44 -0700 [thread overview]
Message-ID: <20220906165445.146913-6-sidhartha.kumar@oracle.com> (raw)
In-Reply-To: <20220906165445.146913-1-sidhartha.kumar@oracle.com>
Removes the last caller of delete_from_page_cache() by converting the
code to its folio equivalent.
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
fs/hugetlbfs/inode.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index d9e08c445e2f..38920702765e 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -364,11 +364,11 @@ static int hugetlbfs_write_end(struct file *file, struct address_space *mapping,
return -EINVAL;
}
-static void hugetlb_delete_from_page_cache(struct page *page)
+static void hugetlb_delete_from_page_cache(struct folio *folio)
{
- ClearPageDirty(page);
- ClearPageUptodate(page);
- delete_from_page_cache(page);
+ folio_clear_dirty(folio);
+ folio_clear_uptodate(folio);
+ filemap_remove_folio(folio);
}
/*
@@ -562,8 +562,8 @@ static bool remove_inode_single_folio(struct hstate *h, struct inode *inode,
* map could fail. Correspondingly, the subpool and global
* reserve usage count can need to be adjusted.
*/
- VM_BUG_ON(HPageRestoreReserve(&folio->page));
- hugetlb_delete_from_page_cache(&folio->page);
+ 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,
@@ -1174,7 +1174,7 @@ static int hugetlbfs_error_remove_page(struct address_space *mapping,
struct inode *inode = mapping->host;
pgoff_t index = page->index;
- hugetlb_delete_from_page_cache(page);
+ hugetlb_delete_from_page_cache(page_folio(page));
if (unlikely(hugetlb_unreserve_pages(inode, index, index + 1, 1)))
hugetlb_fix_reserve_counts(inode);
--
2.31.1
next prev parent reply other threads:[~2022-09-06 16:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 16:54 [PATCH v2 0/6] begin converting hugetlb code to folios Sidhartha Kumar
2022-09-06 16:54 ` [PATCH v2 1/6] mm/hugetlb: add folio support to hugetlb specific flag macros Sidhartha Kumar
2022-09-06 16:54 ` [PATCH v2 2/6] mm: add private field of first tail to struct page and struct folio Sidhartha Kumar
2022-09-06 16:54 ` [PATCH v2 3/6] mm/hugetlb: add hugetlb_folio_subpool() helper Sidhartha Kumar
2022-09-06 16:54 ` [PATCH v2 4/6] mm/hugetlb: add hugetlb_set_folio_subpool() helper Sidhartha Kumar
2022-09-06 16:54 ` Sidhartha Kumar [this message]
2022-09-06 16:54 ` [PATCH v2 6/6] mm/hugetlb add folio_hstate() Sidhartha Kumar
2022-09-07 4:01 ` kernel test robot
2022-09-07 5:23 ` kernel test robot
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=20220906165445.146913-6-sidhartha.kumar@oracle.com \
--to=sidhartha.kumar@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=ccross@google.com \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=peterx@redhat.com \
--cc=songmuchun@bytedance.com \
--cc=vbabka@suse.cz \
--cc=william.kucharski@oracle.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).