Merge tag '4.3-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-block.git] / fs / cifs / cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 0ee63ac4ef72f9d2d1e4288a881c2eda3a56a238..270d3c58fb3b2ac0917d3d40f6083d2d8558b6a0 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1156,6 +1156,10 @@ static ssize_t cifs_copy_file_range(struct file *src_file, loff_t off,
        rc = cifs_file_copychunk_range(xid, src_file, off, dst_file, destoff,
                                        len, flags);
        free_xid(xid);
+
+       if (rc == -EOPNOTSUPP || rc == -EXDEV)
+               rc = generic_copy_file_range(src_file, off, dst_file,
+                                            destoff, len, flags);
        return rc;
 }
 
@@ -1592,7 +1596,6 @@ MODULE_DESCRIPTION
        ("VFS to access SMB3 servers e.g. Samba, Macs, Azure and Windows (and "
        "also older servers complying with the SNIA CIFS Specification)");
 MODULE_VERSION(CIFS_VERSION);
-MODULE_SOFTDEP("pre: arc4");
 MODULE_SOFTDEP("pre: des");
 MODULE_SOFTDEP("pre: ecb");
 MODULE_SOFTDEP("pre: hmac");