Hello community, here is the log from the commit of package xfsprogs for openSUSE:Factory checked in at 2018-02-14 09:18:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfsprogs (Old) and /work/SRC/openSUSE:Factory/.xfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfsprogs" Wed Feb 14 09:18:39 2018 rev:49 rq:573733 version:4.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xfsprogs/xfsprogs.changes 2017-12-23 12:11:36.502630872 +0100 +++ /work/SRC/openSUSE:Factory/.xfsprogs.new/xfsprogs.changes 2018-02-14 09:18:42.619556120 +0100 @@ -1,0 +2,6 @@ +Wed Feb 7 14:24:01 UTC 2018 - [email protected] + +- xfs_io: fix copy_file_range symbol name collision (bsc#1079756). +- Added xfs_io-fix-copy_file_range-symbol-name-collision.patch + +------------------------------------------------------------------- New: ---- xfs_io-fix-copy_file_range-symbol-name-collision.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.JODHaD/_old 2018-02-14 09:18:44.571485368 +0100 +++ /var/tmp/diff_new_pack.JODHaD/_new 2018-02-14 09:18:44.575485223 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfsprogs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,7 @@ Source3: module-setup.sh.in Source4: dracut-fsck-help.txt Patch0: xfsprogs-docdir.diff +Patch1: xfs_io-fix-copy_file_range-symbol-name-collision.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libblkid-devel @@ -78,6 +79,7 @@ %setup -q %if 0%{?suse_version} %patch0 -p1 +%patch1 -p1 %endif %build ++++++ xfs_io-fix-copy_file_range-symbol-name-collision.patch ++++++ From: Darrick J. Wong <[email protected]> Subject: xfs_io: fix copy_file_range symbol name collision References: bsc#1079756 Patch-mainline: https://www.spinics.net/lists/linux-xfs/msg15553.html glibc 2.27 has a copy_file_range wrapper, so we need to change our internal function out of the way to avoid compiler warnings. Reported-by: [email protected] Signed-off-by: Darrick J. Wong <[email protected]> Acked-by: Jeff Mahoney <[email protected]> --- io/copy_file_range.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/io/copy_file_range.c b/io/copy_file_range.c index d1dfc5a..99fba20 100644 --- a/io/copy_file_range.c +++ b/io/copy_file_range.c @@ -42,13 +42,18 @@ copy_range_help(void) ")); } +/* + * Issue a raw copy_file_range syscall; for our test program we don't want the + * glibc buffered copy fallback. + */ static loff_t -copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len) +copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len) { loff_t ret; do { - ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0); + ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, + len, 0); if (ret == -1) { perror("copy_range"); return errno; @@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv) copy_dst_truncate(); } - ret = copy_file_range(fd, &src, &dst, len); + ret = copy_file_range_cmd(fd, &src, &dst, len); close(fd); return ret; } -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
