Ticket #1983: ficlone.patch

lib/vfs/vfs.c

@@ -45 +45 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#ifdef __linux
+# include <linux/fs.h>
+# ifdef HAVE_SYS_IOCTL_H
+#  include <sys/ioctl.h>
+# endif
+#endif
+
 #include "lib/global.h"
 #include "lib/strutil.h"
 #include "lib/util.h"
@@ -656 +663 @@
 #endif /* HAVE_POSIX_FALLOCATE */
 }
 
+int
+vfs_clone_file (int dest_vfs_fd, int src_vfs_fd)
+{
+#ifdef FICLONE
+    void *dest_fd = NULL;
+    void *src_fd = NULL;
+    struct vfs_class *dest_class;
+    struct vfs_class *src_class;
+
+    dest_class = vfs_class_find_by_handle (dest_vfs_fd, &dest_fd);
+    if ((dest_fd == NULL || dest_class->flags & VFSF_LOCAL) == 0)
+    {
+        return -1;
+    }
+
+    src_class = vfs_class_find_by_handle (src_vfs_fd, &src_fd);
+    if ((src_fd == NULL || src_class->flags & VFSF_LOCAL) == 0)
+    {
+        return -1;
+    }
+
+    return ioctl (*(int *) dest_fd, FICLONE, *(int *) src_fd);
+#else
+    (void) dest_vfs_fd;
+    (void) src_vfs_fd;
+    return -1;
+#endif
+}
+
 /* --------------------------------------------------------------------------------------------- */

lib/vfs/vfs.h

@@ -287 +287 @@
 
 int vfs_preallocate (int dest_desc, off_t src_fsize, off_t dest_fsize);
 
+int vfs_clone_file (int dest_vfs_fd, int src_vfs_fd);
+
 /**
  * Interface functions described in interface.c
  */

src/filemanager/file.c

@@ -2366 +2366 @@
     appending = ctx->do_append;
     ctx->do_append = FALSE;
 
+    /* Try clone the file first */
+    if (vfs_clone_file(dest_desc, src_desc) == 0)
+    {
+        dst_status = DEST_FULL;
+        return_status = FILE_CONT;
+        goto ret;
+    }
+
     /* Find out the optimal buffer size.  */
     while (mc_fstat (dest_desc, &dst_stat) != 0)
     {