Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1444593 > unrolled thread

[patch 2/2] perf jit: remove some no-op error handling

Back to article view | Back to linux.kernel

Contents

  [patch 2/2] perf jit: remove some no-op error handling Dan Carpenter <dan.carpenter@oracle.com> - 2016-07-15 23:10 +0200
    Re: [patch 2/2] perf jit: remove some no-op error handling Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-16 00:30 +0200
      Re: [patch 2/2] perf jit: remove some no-op error handling Stephane Eranian <eranian@google.com> - 2016-07-16 18:30 +0200
    [tip:perf/core] perf jit: Remove some no-op error handling tip-bot for Dan Carpenter <tipbot@zytor.com> - 2016-07-19 09:00 +0200

#1444593 — [patch 2/2] perf jit: remove some no-op error handling

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);

[toc] | [next] | [standalone]

#1444650

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);

[toc] | [prev] | [next] | [standalone]

#1444881

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);

[toc] | [prev] | [next] | [standalone]

#1446084 — [tip:perf/core] perf jit: Remove some no-op error handling

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);

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web