[folded-merged] fsdax-dax_unshare_iter-should-return-a-valid-length-fix.patch removed from -mm tree

[Andrew Morton <akpm@linux-foundation.org>]

The quilt patch titled
     Subject: fsdax-dax_unshare_iter-should-return-a-valid-length-fix
has been removed from the -mm tree.  Its filename was
     fsdax-dax_unshare_iter-should-return-a-valid-length-fix.patch

This patch was dropped because it was folded into fsdax-dax_unshare_iter-should-return-a-valid-length.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: fsdax-dax_unshare_iter-should-return-a-valid-length-fix
Date: Thu Feb  2 04:15:00 PM PST 2023

don't mess up `ret', per Matthew

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>
Cc: Shiyang Ruan <ruansy.fnst@fujitsu.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---


--- a/fs/dax.c~fsdax-dax_unshare_iter-should-return-a-valid-length-fix
+++ a/fs/dax.c
@@ -1271,10 +1271,10 @@ static s64 dax_unshare_iter(struct iomap
 	if (ret < 0)
 		goto out_unlock;
 
-	ret = copy_mc_to_kernel(daddr, saddr, length);
-	if (ret)
+	if (copy_mc_to_kernel(daddr, saddr, length) == 0)
+		ret = length;
+	else
 		ret = -EIO;
-	ret = length;
 
 out_unlock:
 	dax_read_unlock(id);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

fsdax-dax_unshare_iter-should-return-a-valid-length.patch
revert-squashfs-harden-sanity-check-in-squashfs_read_xattr_id_table.patch
mm-shrinkers-fix-deadlock-in-shrinker-debugfs-fix.patch
mm-replace-vma-vm_flags-direct-modifications-with-modifier-calls-fix.patch
kasan-infer-allocation-size-by-scanning-metadata-fix.patch
lib-stackdepot-mm-rename-stack_depot_want_early_init-fix.patch
lib-stackdepot-annotate-racy-slab_index-accesses-fix.patch