2021-10-06 06:27:51

by Guo Zhengkui

Subject: [PATCH] perf daemon: Remove a duplicate #include

There is a "#include <sys/file.h>" in line 10, so remove a duplicate
one in line 1124.

Signed-off-by: Guo Zhengkui <[email protected]>
---
tools/perf/builtin-daemon.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
index c13201fb09c3..6cb3f6cc36d0 100644
--- a/tools/perf/builtin-daemon.c
+++ b/tools/perf/builtin-daemon.c
@@ -1121,8 +1121,6 @@ static int setup_config(struct daemon *daemon)
#ifndef F_TLOCK
#define F_TLOCK 2

-#include <sys/file.h>
-
static int lockf(int fd, int cmd, off_t len)
{
if (cmd != F_TLOCK || len != 0)
--
2.20.1

2021-10-08 18:19:58

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf daemon: Remove a duplicate #include

Em Wed, Oct 06, 2021 at 02:22:34PM +0800, Guo Zhengkui escreveu:
> There is a "#include <sys/file.h>" in line 10, so remove a duplicate
> one in line 1124.

Thanks, applied.

- Arnaldo


> Signed-off-by: Guo Zhengkui <[email protected]>
> ---
> tools/perf/builtin-daemon.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
> index c13201fb09c3..6cb3f6cc36d0 100644
> --- a/tools/perf/builtin-daemon.c
> +++ b/tools/perf/builtin-daemon.c
> @@ -1121,8 +1121,6 @@ static int setup_config(struct daemon *daemon)
> #ifndef F_TLOCK
> #define F_TLOCK 2
>
> -#include <sys/file.h>
> -
> static int lockf(int fd, int cmd, off_t len)
> {
> if (cmd != F_TLOCK || len != 0)
> --
> 2.20.1

--

- Arnaldo