Commit 4a31bb53 authored by David Howells's avatar David Howells Committed by sanglipeng
Browse files

cifs: Fix non-availability of dedup breaking generic/304 

stable inclusion
from stable-v5.10.204
commit 0b1711b486deb27f6698b53cf2ff2eff75a9a5bb
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9J4PL

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0b1711b486deb27f6698b53cf2ff2eff75a9a5bb



--------------------------------

[ Upstream commit 691a41d8da4b34fe72f09393505f55f28a8f34ec ]

Deduplication isn't supported on cifs, but cifs doesn't reject it, instead
treating it as extent duplication/cloning.  This can cause generic/304 to go
silly and run for hours on end.

Fix cifs to indicate EOPNOTSUPP if REMAP_FILE_DEDUP is set in
->remap_file_range().

Note that it's unclear whether or not commit b073a080 is meant to cause
cifs to return an error if REMAP_FILE_DEDUP.

Fixes: b073a080 ("cifs: fix that return -EINVAL when do dedupe operation")
Cc: stable@vger.kernel.org
Suggested-by: default avatarDave Chinner <david@fromorbit.com>
cc: Xiaoli Feng <fengxiaoli0714@gmail.com>
cc: Shyam Prasad N <nspmangalore@gmail.com>
cc: Rohith Surabattula <rohiths.msft@gmail.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: Darrick Wong <darrick.wong@oracle.com>
cc: fstests@vger.kernel.org
cc: linux-cifs@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/3876191.1701555260@warthog.procyon.org.uk/


Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 4f846664

fs/cifs/cifsfs.c

+3 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,9 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off, 
	unsigned int xid;

	int rc;



	if (remap_flags & ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY))

	if (remap_flags & REMAP_FILE_DEDUP)

		return -EOPNOTSUPP;

	if (remap_flags & ~REMAP_FILE_ADVISORY)

		return -EINVAL;



	cifs_dbg(FYI, "clone range\n");