aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaoli Feng <fengxiaoli0714@gmail.com>2019-03-16 12:11:54 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-20 09:17:02 +0200
commit21edc981053f290aa03c7f1787d39963ee2cfccb (patch)
treeb8116f400f2f69350b95036da8842dd5f04227e2
parent92b646e276775041ad698c2079be6844378d1372 (diff)
downloadlinux-yocto-21edc981053f290aa03c7f1787d39963ee2cfccb.tar.gz
linux-yocto-21edc981053f290aa03c7f1787d39963ee2cfccb.tar.bz2
linux-yocto-21edc981053f290aa03c7f1787d39963ee2cfccb.zip
cifs: fix that return -EINVAL when do dedupe operation
[ Upstream commit b073a08016a10f01dfb0d0b6c7fa89da0d544963 ] dedupe_file_range operations is combiled into remap_file_range. But it's always skipped for dedupe operations in function cifs_remap_file_range. Example to test: Before this patch: # dd if=/dev/zero of=cifs/file bs=1M count=1 # xfs_io -c "dedupe cifs/file 4k 64k 4k" cifs/file XFS_IOC_FILE_EXTENT_SAME: Invalid argument After this patch: # dd if=/dev/zero of=cifs/file bs=1M count=1 # xfs_io -c "dedupe cifs/file 4k 64k 4k" cifs/file XFS_IOC_FILE_EXTENT_SAME: Operation not supported Influence for xfstests: generic/091 generic/112 generic/127 generic/263 These tests report this error "do_copy_range:: Invalid argument" instead of "FIDEDUPERANGE: Invalid argument". Because there are still two bugs cause these test failed. https://bugzilla.kernel.org/show_bug.cgi?id=202935 https://bugzilla.kernel.org/show_bug.cgi?id=202785 Signed-off-by: Xiaoli Feng <fengxiaoli0714@gmail.com> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/cifs/cifsfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 07cad54b84f1..e8e125acd712 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1010,7 +1010,7 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off,
unsigned int xid;
int rc;
- if (remap_flags & ~REMAP_FILE_ADVISORY)
+ if (remap_flags & ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY))
return -EINVAL;
cifs_dbg(FYI, "clone range\n");