From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
linux-aio@kvack.org, linux-btrfs@vger.kernel.org,
linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com,
linux-mm@kvack.org, linux-xfs@vger.kernel.org,
linux-nfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net,
ocfs2-devel@oss.oracle.com, linux-mtd@lists.infradead.org,
virtualization@lists.linux-foundation.org
Subject: [PATCH 05/20] mm/migrate: Convert expected_page_refs() to folio_expected_refs()
Date: Mon, 6 Jun 2022 21:40:35 +0100 [thread overview]
Message-ID: <20220606204050.2625949-6-willy@infradead.org> (raw)
In-Reply-To: <20220606204050.2625949-1-willy@infradead.org>
Now that both callers have a folio, convert this function to
take a folio & rename it.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/migrate.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/mm/migrate.c b/mm/migrate.c
index 77b8c662c9ca..e0a593e5b5f9 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -337,13 +337,18 @@ void pmd_migration_entry_wait(struct mm_struct *mm, pmd_t *pmd)
}
#endif
-static int expected_page_refs(struct address_space *mapping, struct page *page)
+static int folio_expected_refs(struct address_space *mapping,
+ struct folio *folio)
{
- int expected_count = 1;
+ int refs = 1;
+ if (!mapping)
+ return refs;
- if (mapping)
- expected_count += compound_nr(page) + page_has_private(page);
- return expected_count;
+ refs += folio_nr_pages(folio);
+ if (folio_get_private(folio))
+ refs++;
+
+ return refs;;
}
/*
@@ -360,7 +365,7 @@ int folio_migrate_mapping(struct address_space *mapping,
XA_STATE(xas, &mapping->i_pages, folio_index(folio));
struct zone *oldzone, *newzone;
int dirty;
- int expected_count = expected_page_refs(mapping, &folio->page) + extra_count;
+ int expected_count = folio_expected_refs(mapping, folio) + extra_count;
long nr = folio_nr_pages(folio);
if (!mapping) {
@@ -670,7 +675,7 @@ static int __buffer_migrate_folio(struct address_space *mapping,
return migrate_page(mapping, &dst->page, &src->page, mode);
/* Check whether page does not have extra refs before we do more work */
- expected_count = expected_page_refs(mapping, &src->page);
+ expected_count = folio_expected_refs(mapping, src);
if (folio_ref_count(src) != expected_count)
return -EAGAIN;
--
2.35.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2022-06-06 20:43 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-06 20:40 [PATCH 00/20] Convert aops->migratepage to aops->migrate_folio Matthew Wilcox (Oracle)
2022-06-06 20:40 ` [PATCH 01/20] fs: Add aops->migrate_folio Matthew Wilcox (Oracle)
2022-06-08 8:09 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 02/20] mm/migrate: Convert fallback_migrate_page() to fallback_migrate_folio() Matthew Wilcox (Oracle)
2022-06-08 8:11 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 03/20] mm/migrate: Convert writeout() to take a folio Matthew Wilcox (Oracle)
2022-06-08 8:11 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 04/20] mm/migrate: Convert buffer_migrate_page() to buffer_migrate_folio() Matthew Wilcox (Oracle)
2022-06-07 3:37 ` kernel test robot
2022-06-07 14:57 ` Matthew Wilcox
2022-06-07 8:01 ` kernel test robot
2022-06-08 8:12 ` Christoph Hellwig
2022-06-06 20:40 ` Matthew Wilcox (Oracle) [this message]
2022-06-07 13:41 ` [PATCH 05/20] mm/migrate: Convert expected_page_refs() to folio_expected_refs() Brian Foster
2022-06-07 14:11 ` Matthew Wilcox
2022-06-08 8:14 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 06/20] btrfs: Convert btree_migratepage to migrate_folio Matthew Wilcox (Oracle)
2022-06-08 8:16 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 07/20] nfs: Convert " Matthew Wilcox (Oracle)
2022-06-07 19:02 ` Anna Schumaker
2022-06-08 8:17 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 08/20] mm/migrate: Convert migrate_page() to migrate_folio() Matthew Wilcox (Oracle)
2022-06-08 8:18 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 09/20] mm/migrate: Add filemap_migrate_folio() Matthew Wilcox (Oracle)
2022-06-08 8:19 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 10/20] btrfs: Convert btrfs_migratepage to migrate_folio Matthew Wilcox (Oracle)
2022-06-08 8:19 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 11/20] ubifs: Convert to filemap_migrate_folio() Matthew Wilcox (Oracle)
2022-06-06 20:40 ` [PATCH 12/20] f2fs: " Matthew Wilcox (Oracle)
2022-06-06 20:40 ` [PATCH 13/20] aio: Convert to migrate_folio Matthew Wilcox (Oracle)
2022-06-08 8:20 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 14/20] hugetlb: " Matthew Wilcox (Oracle)
2022-06-07 6:13 ` kernel test robot
2022-06-07 15:02 ` Matthew Wilcox
2022-06-06 20:40 ` [PATCH 15/20] balloon: " Matthew Wilcox (Oracle)
2022-06-07 7:36 ` David Hildenbrand
2022-06-07 14:24 ` Matthew Wilcox
2022-06-07 19:21 ` Matthew Wilcox
2022-06-08 9:59 ` David Hildenbrand
2022-06-08 13:06 ` Rafael Aquini
2022-06-06 20:40 ` [PATCH 16/20] secretmem: " Matthew Wilcox (Oracle)
2022-06-06 20:40 ` [PATCH 17/20] z3fold: " Matthew Wilcox (Oracle)
2022-06-06 20:40 ` [PATCH 18/20] zsmalloc: " Matthew Wilcox (Oracle)
2022-06-06 20:40 ` [PATCH 19/20] fs: Remove aops->migratepage() Matthew Wilcox (Oracle)
2022-06-08 8:21 ` Christoph Hellwig
2022-06-06 20:40 ` [PATCH 20/20] mm/folio-compat: Remove migration compatibility functions Matthew Wilcox (Oracle)
2022-06-08 8:22 ` Christoph Hellwig
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=20220606204050.2625949-6-willy@infradead.org \
--to=willy@infradead.org \
--cc=cluster-devel@redhat.com \
--cc=linux-aio@kvack.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-ntfs-dev@lists.sourceforge.net \
--cc=linux-xfs@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
--cc=virtualization@lists.linux-foundation.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).