[folded-merged] fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix-2.patch removed from -mm tree

[folded-merged] fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix-2.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix-2
has been removed from the -mm tree.  Its filename was
     fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix-2.patch

This patch was dropped because it was folded into fsdax-introduce-page-share-for-fsdax-in-reflink-mode.patch

------------------------------------------------------
From: Shiyang Ruan <ruansy.fnst@fujitsu.com>
Subject: fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix-2
Date: Wed, 7 Dec 2022 02:49:19 +0000

v2.2

Link: https://lkml.kernel.org/r/1670381359-53-1-git-send-email-ruansy.fnst@fujitsu.com
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Darrick J. Wong <djwong@kernel.org>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/dax.c                   |   14 +++++++-------
 include/linux/page-flags.h |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

--- a/fs/dax.c~fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix-2
+++ a/fs/dax.c
@@ -336,28 +336,28 @@ static unsigned long dax_end_pfn(void *e
 
 static inline bool dax_page_is_shared(struct page *page)
 {
-	return (unsigned long)page->mapping == PAGE_MAPPING_DAX_SHARED;
+	return page->mapping == PAGE_MAPPING_DAX_SHARED;
 }
 
 /*
  * Set the page->mapping with PAGE_MAPPING_DAX_SHARED flag, increase the
  * refcount.
  */
-static inline void dax_page_bump_sharing(struct page *page)
+static inline void dax_page_share_get(struct page *page)
 {
-	if ((uintptr_t)page->mapping != PAGE_MAPPING_DAX_SHARED) {
+	if (page->mapping != PAGE_MAPPING_DAX_SHARED) {
 		/*
 		 * Reset the index if the page was already mapped
 		 * regularly before.
 		 */
 		if (page->mapping)
 			page->share = 1;
-		page->mapping = (void *)PAGE_MAPPING_DAX_SHARED;
+		page->mapping = PAGE_MAPPING_DAX_SHARED;
 	}
 	page->share++;
 }
 
-static inline unsigned long dax_page_drop_sharing(struct page *page)
+static inline unsigned long dax_page_share_put(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_page_bump_sharing(page);
+			dax_page_share_get(page);
 		} else {
 			WARN_ON_ONCE(page->mapping);
 			page->mapping = mapping;
@@ -404,7 +404,7 @@ static void dax_disassociate_entry(void
 		WARN_ON_ONCE(trunc && page_ref_count(page) > 1);
 		if (dax_page_is_shared(page)) {
 			/* keep the shared flag if this page is still shared */
-			if (dax_page_drop_sharing(page) > 0)
+			if (dax_page_share_put(page) > 0)
 				continue;
 		} else
 			WARN_ON_ONCE(page->mapping && page->mapping != mapping);
--- a/include/linux/page-flags.h~fsdax-introduce-page-share-for-fsdax-in-reflink-mode-fix-2
+++ a/include/linux/page-flags.h
@@ -638,7 +638,7 @@ PAGEFLAG_FALSE(VmemmapSelfHosted, vmemma
  * Different with flags above, this flag is used only for fsdax mode.  It
  * indicates that this page->mapping is now under reflink case.
  */
-#define PAGE_MAPPING_DAX_SHARED	0x1
+#define PAGE_MAPPING_DAX_SHARED	((void *)0x1)
 
 static __always_inline bool folio_mapping_flags(struct folio *folio)
 {
_

Patches currently in -mm which might be from ruansy.fnst@fujitsu.com are

fsdax-introduce-page-share-for-fsdax-in-reflink-mode.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