1 files changed, 24 insertions, 19 deletions

diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index 986313da0c88..84dd957efa24 100644
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -434,14 +434,14 @@ enum ovl_copyop {
         OVL_DEDUPE,
 };
 
-static ssize_t ovl_copyfile(struct file *file_in, loff_t pos_in,
+static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,
                             struct file *file_out, loff_t pos_out,
-                            u64 len, unsigned int flags, enum ovl_copyop op)
+                            loff_t len, unsigned int flags, enum ovl_copyop op)
 {
         struct inode *inode_out = file_inode(file_out);
         struct fd real_in, real_out;
         const struct cred *old_cred;
-        ssize_t ret;
+        loff_t ret;
 
         ret = ovl_real_fdget(file_out, &real_out);
         if (ret)
@@ -462,12 +462,13 @@ static ssize_t ovl_copyfile(struct file *file_in, loff_t pos_in,
 
         case OVL_CLONE:
                 ret = vfs_clone_file_range(real_in.file, pos_in,
-                                           real_out.file, pos_out, len);
+                                           real_out.file, pos_out, len, flags);
                 break;
 
         case OVL_DEDUPE:
                 ret = vfs_dedupe_file_range_one(real_in.file, pos_in,
-                                                real_out.file, pos_out, len);
+                                                real_out.file, pos_out, len,
+                                                flags);
                 break;
         }
         revert_creds(old_cred);
@@ -489,26 +490,31 @@ static ssize_t ovl_copy_file_range(struct file *file_in, loff_t pos_in,
                             OVL_COPY);
 }
 
-static int ovl_clone_file_range(struct file *file_in, loff_t pos_in,
-                                struct file *file_out, loff_t pos_out, u64 len)
+static loff_t ovl_remap_file_range(struct file *file_in, loff_t pos_in,
+                                   struct file *file_out, loff_t pos_out,
+                                   loff_t len, unsigned int remap_flags)
 {
-        return ovl_copyfile(file_in, pos_in, file_out, pos_out, len, 0,
-                            OVL_CLONE);
-}
+        enum ovl_copyop op;
+
+        if (remap_flags & ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY))
+                return -EINVAL;
+
+        if (remap_flags & REMAP_FILE_DEDUP)
+                op = OVL_DEDUPE;
+        else
+                op = OVL_CLONE;
 
-static int ovl_dedupe_file_range(struct file *file_in, loff_t pos_in,
-                                 struct file *file_out, loff_t pos_out, u64 len)
-{
         /*
          * Don't copy up because of a dedupe request, this wouldn't make sense
          * most of the time (data would be duplicated instead of deduplicated).
          */
-        if (!ovl_inode_upper(file_inode(file_in)) ||
-            !ovl_inode_upper(file_inode(file_out)))
+        if (op == OVL_DEDUPE &&
+            (!ovl_inode_upper(file_inode(file_in)) ||
+             !ovl_inode_upper(file_inode(file_out))))
                 return -EPERM;
 
-        return ovl_copyfile(file_in, pos_in, file_out, pos_out, len, 0,
-                            OVL_DEDUPE);
+        return ovl_copyfile(file_in, pos_in, file_out, pos_out, len,
+                            remap_flags, op);
 }
 
 const struct file_operations ovl_file_operations = {
@@ -525,6 +531,5 @@ const struct file_operations ovl_file_operations = {
         .compat_ioctl   = ovl_compat_ioctl,
 
         .copy_file_range        = ovl_copy_file_range,
-        .clone_file_range       = ovl_clone_file_range,
-        .dedupe_file_range      = ovl_dedupe_file_range,
+        .remap_file_range       = ovl_remap_file_range,
 };