perf tools: Make copyfile_offset() static
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: c23c2a0f236601c635d9a9d18d7993641e72aa8c Gitweb: http://git.kernel.org/tip/c23c2a0f236601c635d9a9d18d7993641e72aa8c Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 11 Sep 2017 10:50:26 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 13 Sep 2017 09:49:16 -0300
perf tools: Make copyfile_offset() static
There are no usage outside util.c and this is the only remaining reason for fcntl.h to be included in util.h, to get the loff_t definition in Alpine Linux, so make it static.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/tests/builtin-test.c | 1 + tools/perf/util/data.c | 1 + tools/perf/util/dso.c | 1 + tools/perf/util/event.c | 1 + tools/perf/util/evlist.h | 1 + tools/perf/util/namespaces.c | 1 + tools/perf/util/pmu.c | 1 + tools/perf/util/probe-file.c | 1 + tools/perf/util/util.c | 3 ++- tools/perf/util/util.h | 2 -- tools/perf/util/zlib.c | 1 + 11 files changed, 11 insertions(+), 3 deletions(-)
tools/perf/tests/builtin-test.c +1 -0
@@ -3,6 +3,7 @@* * Builtin regression testing command: ever growing number of sanity tests */ +#include <fcntl.h> #include <errno.h> #include <unistd.h> #include <string.h>
tools/perf/util/data.c +1 -0
@@ -3,6 +3,7 @@#include <sys/types.h> #include <sys/stat.h> #include <errno.h> +#include <fcntl.h> #include <unistd.h> #include <string.h>
tools/perf/util/dso.c +1 -0
@@ -6,6 +6,7 @@#include <sys/stat.h> #include <unistd.h> #include <errno.h> +#include <fcntl.h> #include "compress.h" #include "path.h" #include "symbol.h"
tools/perf/util/event.c +1 -0
@@ -1,5 +1,6 @@#include <dirent.h> #include <errno.h> +#include <fcntl.h> #include <inttypes.h> #include <linux/kernel.h> #include <linux/types.h>
tools/perf/util/evlist.h +1 -0
@@ -6,6 +6,7 @@#include <linux/refcount.h> #include <linux/list.h> #include <api/fd/array.h> +#include <fcntl.h> #include <stdio.h> #include "../perf.h" #include "event.h"
tools/perf/util/namespaces.c +1 -0
@@ -11,6 +11,7 @@#include "event.h" #include <sys/types.h> #include <sys/stat.h> +#include <fcntl.h> #include <limits.h> #include <sched.h> #include <stdlib.h>
tools/perf/util/pmu.c +1 -0
@@ -2,6 +2,7 @@#include <linux/compiler.h> #include <sys/types.h> #include <errno.h> +#include <fcntl.h> #include <sys/stat.h> #include <unistd.h> #include <stdio.h>
tools/perf/util/probe-file.c +1 -0
@@ -15,6 +15,7 @@* */ #include <errno.h> +#include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/uio.h>
tools/perf/util/util.c +2 -1
@@ -6,6 +6,7 @@#include <sys/stat.h> #include <sys/utsname.h> #include <dirent.h> +#include <fcntl.h> #include <inttypes.h> #include <signal.h> #include <stdio.h>
@@ -174,7 +175,7 @@ out:return err; } -int copyfile_offset (int ifd,loff_t off_in,int ofd,loff_t off_out,u64 size) +static int copyfile_offset (int ifd,loff_t off_in,int ofd,loff_t off_out,u64 size) {void *ptr;loff_t pgoff;
tools/perf/util/util.h +0 -2
@@ -5,7 +5,6 @@/* glibc 2.20 deprecates _BSD_SOURCE in favour of _DEFAULT_SOURCE */ #define _DEFAULT_SOURCE 1 -#include <fcntl.h> #include <stdbool.h> #include <stddef.h> #include <stdlib.h>
@@ -35,7 +34,6 @@ bool lsdir_no_dot_filter(const char *name, struct dirent *d);int copyfile (const char *from,const char *to);int copyfile_mode (const char *from,const char *to,mode_t mode);int copyfile_ns (const char *from,const char *to,struct nsinfo *nsi); -int copyfile_offset (int fromfd,loff_t from_ofs,int tofd,loff_t to_ofs,u64 size);ssize_t readn (int fd,void *buf,size_t n);ssize_t writen (int fd,const void *buf,size_t n);
tools/perf/util/zlib.c +1 -0
@@ -1,3 +1,4 @@ +#include <fcntl.h> #include <stdio.h> #include <unistd.h> #include <sys/stat.h>