Skip to contentSkip to conversation

cifs: fix that return -EINVAL when do dedupe operation

PATCH Superseded XiaoLi Feng 2 participants 2 messages Mar 16, 2019

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cifs: fix that return -EINVAL when do dedupe operation

From: Xiaoli Feng <[email protected]>

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:
XFS_IOC_FILE_EXTENT_SAME: Invalid argument

After this patch:
XFS_IOC_FILE_EXTENT_SAME: Operation not supported

---
 fs/cifs/cifsfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/cifsfs.c +1 -1
index 217276b8b942..f9b71c12cc9f 100644
@@ -1008,7 +1008,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");
Signature · 1 line
2.18.1
#1 lore raw

Do you have a list of any xfstests that this also helps with?

Quoted 35 lines · XiaoLi Feng

From: Xiaoli Feng <[email protected]>

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:
XFS_IOC_FILE_EXTENT_SAME: Invalid argument

After this patch:
XFS_IOC_FILE_EXTENT_SAME: Operation not supported

---
 fs/cifs/cifsfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/cifsfs.c +1 -2
index 217276b8b942..f9b71c12cc9f 100644
@@ -1008,7 +1008,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");
--

2.18.1

Signature · 3 lines
Thanks,

Steve