chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Add remaining updates from upstream (2/3)
[elogind.git]
/
src
/
basic
/
copy.c
diff --git
a/src/basic/copy.c
b/src/basic/copy.c
index 3c02fd41ea22710e27788a9fcc37b689cb020dc8..c5cbbb79f44070f444e6aaeafda60b508583ba69 100644
(file)
--- a/
src/basic/copy.c
+++ b/
src/basic/copy.c
@@
-22,10
+22,20
@@
#include <sys/sendfile.h>
#include <sys/xattr.h>
#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 "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)
#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);
assert(fdf >= 0);
assert(fdt >= 0);
+// UNNEEDED by elogind
#if 0
/* Try btrfs reflinks first. */
if (try_reflink &&
#if 0
/* Try btrfs reflinks first. */
if (try_reflink &&