6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shiyang Ruan <ruansy.fnst@xxxxxxxxxxx> commit 388bc034d91d480efa88abc5c8d6e6c8a878b1ab upstream. The copy_mc_to_kernel() will return 0 if it executed successfully. Then the return value should be set to the length it copied. [akpm@xxxxxxxxxxxxxxxxxxxx: don't mess up `ret', per Matthew] Link: https://lkml.kernel.org/r/1675341227-14-1-git-send-email-ruansy.fnst@xxxxxxxxxxx Fixes: d984648e428b ("fsdax,xfs: port unshare to fsdax") Signed-off-by: Shiyang Ruan <ruansy.fnst@xxxxxxxxxxx> Cc: Darrick J. Wong <djwong@xxxxxxxxxx> Cc: Alistair Popple <apopple@xxxxxxxxxx> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: Dave Chinner <david@xxxxxxxxxxxxx> Cc: Jason Gunthorpe <jgg@xxxxxxxxxx> Cc: John Hubbard <jhubbard@xxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/dax.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/fs/dax.c +++ b/fs/dax.c @@ -1247,8 +1247,9 @@ 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; out_unlock:
