* [patch 2/2] perf jit: remove some no-op error handling
@ 2016-07-15 21:08 ` Dan Carpenter
0 siblings, 0 replies; 7+ messages in thread
From: Dan Carpenter @ 2016-07-15 21:08 UTC (permalink / raw)
To: Peter Zijlstra, Stephane Eranian
Cc: Ingo Molnar, Arnaldo Carvalho de Melo, Alexander Shishkin,
Adrian Hunter, linux-kernel, kernel-janitors
info.e_machine is a uint16_t so m is never less than zero. It looks
like this was maybe left over code from earlier versions so I've just
removed it.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
index 91bf333..55daeff 100644
--- a/tools/perf/jvmti/jvmti_agent.c
+++ b/tools/perf/jvmti/jvmti_agent.c
@@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
ssize_t sret;
char id[16];
int fd, ret = -1;
- int m = -1;
struct {
uint16_t e_type;
uint16_t e_machine;
@@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
if (sret != sizeof(info))
goto error;
- m = info.e_machine;
- if (m < 0)
- m = 0; /* ELF EM_NONE */
-
- hdr->elf_mach = m;
+ hdr->elf_mach = info.e_machine;
ret = 0;
error:
close(fd);
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [patch 2/2] perf jit: remove some no-op error handling
2016-07-15 21:08 ` Dan Carpenter
@ 2016-07-15 22:27 ` Arnaldo Carvalho de Melo
-1 siblings, 0 replies; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-07-15 22:27 UTC (permalink / raw)
To: Dan Carpenter
Cc: Peter Zijlstra, Stephane Eranian, Ingo Molnar, Alexander Shishkin,
Adrian Hunter, linux-kernel, kernel-janitors
Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:
> info.e_machine is a uint16_t so m is never less than zero. It looks
> like this was maybe left over code from earlier versions so I've just
> removed it.
Yeah, it sure looks like that, applying, thanks,
- Arnaldo
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
> index 91bf333..55daeff 100644
> --- a/tools/perf/jvmti/jvmti_agent.c
> +++ b/tools/perf/jvmti/jvmti_agent.c
> @@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
> ssize_t sret;
> char id[16];
> int fd, ret = -1;
> - int m = -1;
> struct {
> uint16_t e_type;
> uint16_t e_machine;
> @@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
> if (sret != sizeof(info))
> goto error;
>
> - m = info.e_machine;
> - if (m < 0)
> - m = 0; /* ELF EM_NONE */
> -
> - hdr->elf_mach = m;
> + hdr->elf_mach = info.e_machine;
> ret = 0;
> error:
> close(fd);
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch 2/2] perf jit: remove some no-op error handling
@ 2016-07-15 22:27 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-07-15 22:27 UTC (permalink / raw)
To: Dan Carpenter
Cc: Peter Zijlstra, Stephane Eranian, Ingo Molnar, Alexander Shishkin,
Adrian Hunter, linux-kernel, kernel-janitors
Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:
> info.e_machine is a uint16_t so m is never less than zero. It looks
> like this was maybe left over code from earlier versions so I've just
> removed it.
Yeah, it sure looks like that, applying, thanks,
- Arnaldo
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
> index 91bf333..55daeff 100644
> --- a/tools/perf/jvmti/jvmti_agent.c
> +++ b/tools/perf/jvmti/jvmti_agent.c
> @@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
> ssize_t sret;
> char id[16];
> int fd, ret = -1;
> - int m = -1;
> struct {
> uint16_t e_type;
> uint16_t e_machine;
> @@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
> if (sret != sizeof(info))
> goto error;
>
> - m = info.e_machine;
> - if (m < 0)
> - m = 0; /* ELF EM_NONE */
> -
> - hdr->elf_mach = m;
> + hdr->elf_mach = info.e_machine;
> ret = 0;
> error:
> close(fd);
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch 2/2] perf jit: remove some no-op error handling
2016-07-15 22:27 ` Arnaldo Carvalho de Melo
@ 2016-07-16 16:25 ` Stephane Eranian
-1 siblings, 0 replies; 7+ messages in thread
From: Stephane Eranian @ 2016-07-16 16:25 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Dan Carpenter, Peter Zijlstra, Ingo Molnar, Alexander Shishkin,
Adrian Hunter, LKML, kernel-janitors
On Fri, Jul 15, 2016 at 3:27 PM, Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
> Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:
>> info.e_machine is a uint16_t so m is never less than zero. It looks
>> like this was maybe left over code from earlier versions so I've just
>> removed it.
>
> Yeah, it sure looks like that, applying, thanks,
>
Thanks for cleaning this up.
> - Arnaldo
>
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>
>> diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
>> index 91bf333..55daeff 100644
>> --- a/tools/perf/jvmti/jvmti_agent.c
>> +++ b/tools/perf/jvmti/jvmti_agent.c
>> @@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
>> ssize_t sret;
>> char id[16];
>> int fd, ret = -1;
>> - int m = -1;
>> struct {
>> uint16_t e_type;
>> uint16_t e_machine;
>> @@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
>> if (sret != sizeof(info))
>> goto error;
>>
>> - m = info.e_machine;
>> - if (m < 0)
>> - m = 0; /* ELF EM_NONE */
>> -
>> - hdr->elf_mach = m;
>> + hdr->elf_mach = info.e_machine;
>> ret = 0;
>> error:
>> close(fd);
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch 2/2] perf jit: remove some no-op error handling
@ 2016-07-16 16:25 ` Stephane Eranian
0 siblings, 0 replies; 7+ messages in thread
From: Stephane Eranian @ 2016-07-16 16:25 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Dan Carpenter, Peter Zijlstra, Ingo Molnar, Alexander Shishkin,
Adrian Hunter, LKML, kernel-janitors
On Fri, Jul 15, 2016 at 3:27 PM, Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
> Em Sat, Jul 16, 2016 at 12:08:36AM +0300, Dan Carpenter escreveu:
>> info.e_machine is a uint16_t so m is never less than zero. It looks
>> like this was maybe left over code from earlier versions so I've just
>> removed it.
>
> Yeah, it sure looks like that, applying, thanks,
>
Thanks for cleaning this up.
> - Arnaldo
>
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>
>> diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
>> index 91bf333..55daeff 100644
>> --- a/tools/perf/jvmti/jvmti_agent.c
>> +++ b/tools/perf/jvmti/jvmti_agent.c
>> @@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
>> ssize_t sret;
>> char id[16];
>> int fd, ret = -1;
>> - int m = -1;
>> struct {
>> uint16_t e_type;
>> uint16_t e_machine;
>> @@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
>> if (sret != sizeof(info))
>> goto error;
>>
>> - m = info.e_machine;
>> - if (m < 0)
>> - m = 0; /* ELF EM_NONE */
>> -
>> - hdr->elf_mach = m;
>> + hdr->elf_mach = info.e_machine;
>> ret = 0;
>> error:
>> close(fd);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [tip:perf/core] perf jit: Remove some no-op error handling
2016-07-15 21:08 ` Dan Carpenter
(?)
(?)
@ 2016-07-19 6:49 ` tip-bot for Dan Carpenter
-1 siblings, 0 replies; 7+ messages in thread
From: tip-bot for Dan Carpenter @ 2016-07-19 6:49 UTC (permalink / raw)
To: linux-tip-commits
Cc: mingo, hpa, linux-kernel, dan.carpenter, acme, eranian,
alexander.shishkin, peterz, tglx, adrian.hunter
Commit-ID: 9fcfcdf3c7b613c0d9536f57587456411b8a4e33
Gitweb: http://git.kernel.org/tip/9fcfcdf3c7b613c0d9536f57587456411b8a4e33
Author: Dan Carpenter <dan.carpenter@oracle.com>
AuthorDate: Sat, 16 Jul 2016 00:08:36 +0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 18 Jul 2016 12:20:00 -0300
perf jit: Remove some no-op error handling
The 'info.e_machine' struct member is an uint16_t so 'm' is never less
than zero. It looks like this was maybe left over code from earlier
versions so I've just removed it.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: kernel-janitors@vger.kernel.org
Link: http://lkml.kernel.org/r/20160715210836.GB19522@mwanda
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/jvmti/jvmti_agent.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tools/perf/jvmti/jvmti_agent.c b/tools/perf/jvmti/jvmti_agent.c
index 91bf333..55daeff 100644
--- a/tools/perf/jvmti/jvmti_agent.c
+++ b/tools/perf/jvmti/jvmti_agent.c
@@ -59,7 +59,6 @@ static int get_e_machine(struct jitheader *hdr)
ssize_t sret;
char id[16];
int fd, ret = -1;
- int m = -1;
struct {
uint16_t e_type;
uint16_t e_machine;
@@ -81,11 +80,7 @@ static int get_e_machine(struct jitheader *hdr)
if (sret != sizeof(info))
goto error;
- m = info.e_machine;
- if (m < 0)
- m = 0; /* ELF EM_NONE */
-
- hdr->elf_mach = m;
+ hdr->elf_mach = info.e_machine;
ret = 0;
error:
close(fd);
^ permalink raw reply related [flat|nested] 7+ messages in thread