diff options
| author | Xiaoli Feng <fengxiaoli0714@gmail.com> | 2019-03-16 00:11:54 -0400 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-03-22 23:36:54 -0400 |
| commit | b073a08016a10f01dfb0d0b6c7fa89da0d544963 (patch) | |
| tree | 6898c03cc18ffb4d5127042d87114a7b97e58767 | |
| parent | 0b0dfd59216755cfa5a47eab2811efaa4589db68 (diff) | |
cifs: fix that return -EINVAL when do dedupe operation
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>
| -rw-r--r-- | fs/cifs/cifsfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 217276b8b942..f9b71c12cc9f 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
| @@ -1008,7 +1008,7 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off, | |||
| 1008 | unsigned int xid; | 1008 | unsigned int xid; |
| 1009 | int rc; | 1009 | int rc; |
| 1010 | 1010 | ||
| 1011 | if (remap_flags & ~REMAP_FILE_ADVISORY) | 1011 | if (remap_flags & ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY)) |
| 1012 | return -EINVAL; | 1012 | return -EINVAL; |
| 1013 | 1013 | ||
| 1014 | cifs_dbg(FYI, "clone range\n"); | 1014 | cifs_dbg(FYI, "clone range\n"); |
