cp: go back to copy_file_range optimization

This reverts part of the previous change.
* src/copy.c (lseek_copy): When calling sparse_copy, do not
ask it to scan for zeros unless --sparse=always, so that it
can use copy_file_range which can be far more efficient.

diff --git a/src/copy.c b/src/copy.c
index e328bd886f88c25bf6a4ace222807c3386dd6a99..134c57c8b7daabe1eed314cbcab580d6ad61fc87 100644 (file)
--- a/src/copy.c
+++ b/src/copy.c
@@ -617,7 +617,7 @@ lseek_copy (int src_fd, int dest_fd, char **abuf, size_t buf_size,
       if ( ! sparse_copy (src_fd, dest_fd, abuf, buf_size,
                           allow_reflink, src_name, dst_name,
                           ext_len,
-                          sparse_mode != SPARSE_NEVER ? hole_size : nullptr,
+                          sparse_mode == SPARSE_ALWAYS ? hole_size : nullptr,
                           &n_read))
         return false;