vfs: combine the clone and dedupe into a single remap_file_range

Combine the clone_file_range and dedupe_file_range operations into a
single remap_file_range file operation dispatch since they're
fundamentally the same operation.  The differences between the two can
be made in the prep functions.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>

1 files changed, 8 insertions, 16 deletions

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 9fa35cb6f6e0..0b757a24567c 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2527,24 +2527,18 @@ out:
         return offset;
 }
 
-static int ocfs2_file_clone_range(struct file *file_in,
+static int ocfs2_remap_file_range(struct file *file_in,
                                   loff_t pos_in,
                                   struct file *file_out,
                                   loff_t pos_out,
-                                  u64 len)
+                                  u64 len,
+                                  unsigned int remap_flags)
 {
-        return ocfs2_reflink_remap_range(file_in, pos_in, file_out, pos_out,
-                                         len, false);
-}
+        if (remap_flags & ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY))
+                return -EINVAL;
 
-static int ocfs2_file_dedupe_range(struct file *file_in,
-                                   loff_t pos_in,
-                                   struct file *file_out,
-                                   loff_t pos_out,
-                                   u64 len)
-{
         return ocfs2_reflink_remap_range(file_in, pos_in, file_out, pos_out,
-                                          len, true);
+                                         len, remap_flags & REMAP_FILE_DEDUP);
 }
 
 const struct inode_operations ocfs2_file_iops = {
@@ -2586,8 +2580,7 @@ const struct file_operations ocfs2_fops = {
         .splice_read    = generic_file_splice_read,
         .splice_write   = iter_file_splice_write,
         .fallocate      = ocfs2_fallocate,
-        .clone_file_range = ocfs2_file_clone_range,
-        .dedupe_file_range = ocfs2_file_dedupe_range,
+        .remap_file_range = ocfs2_remap_file_range,
 };
 
 const struct file_operations ocfs2_dops = {
@@ -2633,8 +2626,7 @@ const struct file_operations ocfs2_fops_no_plocks = {
         .splice_read    = generic_file_splice_read,
         .splice_write   = iter_file_splice_write,
         .fallocate      = ocfs2_fallocate,
-        .clone_file_range = ocfs2_file_clone_range,
-        .dedupe_file_range = ocfs2_file_dedupe_range,
+        .remap_file_range = ocfs2_remap_file_range,
 };
 
 const struct file_operations ocfs2_dops_no_plocks = {