diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-04-06 14:55:07 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-04-26 12:59:13 +0200 |
commit | eaca07ccfdf5d7dabc50afc7e539c2413dd69d3e (patch) | |
tree | f2876260f754b2c3f86814980568e6142cffafcd /src/basic/copy.c | |
parent | b96ed50e3493103d075ff2ce4c3fbad8f26b2e22 (diff) |
Prep v228: Add remaining updates from upstream (2/3)
Apply remaining fixes and the performed move of utility functions
into their own foo-util.[hc] files on libbasic.
Diffstat (limited to 'src/basic/copy.c')
-rw-r--r-- | src/basic/copy.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/basic/copy.c b/src/basic/copy.c index 3c02fd41e..c5cbbb79f 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -22,10 +22,20 @@ #include <sys/sendfile.h> #include <sys/xattr.h> -#include "util.h" -// #include "btrfs-util.h" -#include "strv.h" +//#include "alloc-util.h" +//#include "btrfs-util.h" +//#include "chattr-util.h" #include "copy.h" +//#include "dirent-util.h" +//#include "fd-util.h" +//#include "fileio.h" +//#include "fs-util.h" +#include "io-util.h" +//#include "string-util.h" +#include "strv.h" +//#include "umask-util.h" +#include "util.h" +//#include "xattr-util.h" #define COPY_BUFFER_SIZE (16*1024) @@ -35,6 +45,7 @@ int copy_bytes(int fdf, int fdt, uint64_t max_bytes, bool try_reflink) { assert(fdf >= 0); assert(fdt >= 0); +// UNNEEDED by elogind #if 0 /* Try btrfs reflinks first. */ if (try_reflink && |