The patch titled Subject: fsdax: introduce page->share for fsdax in reflink mode has been added to the -mm mm-unstable branch. Its filename is fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Shiyang Ruan <ruansy.fnst@xxxxxxxxxxx> Subject: fsdax: introduce page->share for fsdax in reflink mode Date: Fri, 2 Dec 2022 09:23:11 +0000 rename several functions Link: https://lkml.kernel.org/r/1669972991-246-1-git-send-email-ruansy.fnst@xxxxxxxxxxx Signed-off-by: Shiyang Ruan <ruansy.fnst@xxxxxxxxxxx> Cc: Alistair Popple <apopple@xxxxxxxxxx> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: Darrick J. Wong <djwong@xxxxxxxxxx> Cc: Dave Chinner <david@xxxxxxxxxxxxx> Cc: Jason Gunthorpe <jgg@xxxxxxxxxx> Cc: John Hubbard <jhubbard@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/dax.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/fs/dax.c~fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix +++ a/fs/dax.c @@ -334,7 +334,7 @@ static unsigned long dax_end_pfn(void *e for (pfn = dax_to_pfn(entry); \ pfn < dax_end_pfn(entry); pfn++) -static inline bool dax_mapping_is_shared(struct page *page) +static inline bool dax_page_is_shared(struct page *page) { return (unsigned long)page->mapping == PAGE_MAPPING_DAX_SHARED; } @@ -343,7 +343,7 @@ static inline bool dax_mapping_is_shared * Set the page->mapping with PAGE_MAPPING_DAX_SHARED flag, increase the * refcount. */ -static inline void dax_mapping_set_shared(struct page *page) +static inline void dax_page_bump_sharing(struct page *page) { if ((uintptr_t)page->mapping != PAGE_MAPPING_DAX_SHARED) { /* @@ -357,7 +357,7 @@ static inline void dax_mapping_set_share page->share++; } -static inline unsigned long dax_mapping_decrease_shared(struct page *page) +static inline unsigned long dax_page_drop_sharing(struct page *page) { return --page->share; } @@ -381,7 +381,7 @@ static void dax_associate_entry(void *en struct page *page = pfn_to_page(pfn); if (shared) { - dax_mapping_set_shared(page); + dax_page_bump_sharing(page); } else { WARN_ON_ONCE(page->mapping); page->mapping = mapping; @@ -402,9 +402,9 @@ static void dax_disassociate_entry(void struct page *page = pfn_to_page(pfn); WARN_ON_ONCE(trunc && page_ref_count(page) > 1); - if (dax_mapping_is_shared(page)) { + if (dax_page_is_shared(page)) { /* keep the shared flag if this page is still shared */ - if (dax_mapping_decrease_shared(page) > 0) + if (dax_page_drop_sharing(page) > 0) continue; } else WARN_ON_ONCE(page->mapping && page->mapping != mapping); _ Patches currently in -mm which might be from ruansy.fnst@xxxxxxxxxxx are fsdax-introduce-page-share-for-fsdax-in-reflink-mode.patch fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix.patch fsdax-invalidate-pages-when-cow.patch fsdax-zero-the-edges-if-source-is-hole-or-unwritten.patch fsdaxxfs-set-the-shared-flag-when-file-extent-is-shared.patch fsdax-dedupe-iter-two-files-at-the-same-time.patch xfs-use-dax-ops-for-zero-and-truncate-in-fsdax-mode.patch fsdaxxfs-port-unshare-to-fsdax.patch xfs-remove-restrictions-for-fsdax-and-reflink.patch