diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-04-06 10:49:52 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-04-06 10:49:52 +0200 |
commit | d4337c15d5835c8eecf079bd5173f8b5c51727c7 (patch) | |
tree | f9cadf1f81c2fb7e2f8d6ff4752c45fdeb00624f /src/basic/copy.c | |
parent | 056f0498fefc4c3e3cedf11ea3ba1b04a8694118 (diff) | |
parent | 6dfde7acf1405adbb7adb2adc6969c4eb3c0990a (diff) |
Merge pull request #2944 from keszybz/man-coredump-sysctl
Man coredump sysctl
Diffstat (limited to 'src/basic/copy.c')
-rw-r--r-- | src/basic/copy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/copy.c b/src/basic/copy.c index 41dc8ca79a..e2db4be9ff 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -71,7 +71,7 @@ static ssize_t try_copy_file_range(int fd_in, loff_t *off_in, int copy_bytes(int fdf, int fdt, uint64_t max_bytes, bool try_reflink) { bool try_cfr = true, try_sendfile = true, try_splice = true; int r; - size_t m = SSIZE_MAX; /* that the maximum that sendfile and c_f_r accept */ + size_t m = SSIZE_MAX; /* that is the maximum that sendfile and c_f_r accept */ assert(fdf >= 0); assert(fdt >= 0); @@ -94,8 +94,8 @@ int copy_bytes(int fdf, int fdt, uint64_t max_bytes, bool try_reflink) { if (max_bytes <= 0) return 1; /* return > 0 if we hit the max_bytes limit */ - if ((uint64_t) m > max_bytes) - m = (size_t) max_bytes; + if (m > max_bytes) + m = max_bytes; } /* First try copy_file_range(), unless we already tried */ |