2019-06-05 21:05:10

by Enrico Weigelt, metux IT consult

Subject: [PATCH] net: sctp: drop unneeded likely() call around IS_ERR()

From: Enrico Weigelt <[email protected]>

IS_ERR() already calls unlikely(), so this extra unlikely() call
around IS_ERR() is not needed.

Signed-off-by: Enrico Weigelt <[email protected]>
---
net/sctp/socket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 39ea0a3..c7b0f51 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -985,7 +985,7 @@ static int sctp_setsockopt_bindx(struct sock *sk,
return -EINVAL;

kaddrs = memdup_user(addrs, addrs_size);
- if (unlikely(IS_ERR(kaddrs)))
+ if (IS_ERR(kaddrs))
return PTR_ERR(kaddrs);

/* Walk through the addrs buffer and count the number of addresses. */
@@ -1315,7 +1315,7 @@ static int __sctp_setsockopt_connectx(struct sock *sk,
return -EINVAL;

kaddrs = memdup_user(addrs, addrs_size);
- if (unlikely(IS_ERR(kaddrs)))
+ if (IS_ERR(kaddrs))
return PTR_ERR(kaddrs);

/* Allow security module to validate connectx addresses. */
--
1.9.1

2019-06-05 21:52:21

by Marcelo Ricardo Leitner

Subject: Re: [PATCH] net: sctp: drop unneeded likely() call around IS_ERR()

On Wed, Jun 05, 2019 at 11:03:27PM +0200, Enrico Weigelt, metux IT consult wrote:
> From: Enrico Weigelt <[email protected]>
>
> IS_ERR() already calls unlikely(), so this extra unlikely() call
> around IS_ERR() is not needed.
>
> Signed-off-by: Enrico Weigelt <[email protected]>

Hi,

This patch overlaps with
Jun 05 Kefeng Wang (4.4K) [PATCH net-next] net: Drop unlikely before IS_ERR(_OR_NULL)

Marcelo

2019-06-05 22:55:43

by Enrico Weigelt, metux IT consult

Subject: Re: [PATCH] net: sctp: drop unneeded likely() call around IS_ERR()

On 05.06.19 21:50, Marcelo Ricardo Leitner wrote:
> On Wed, Jun 05, 2019 at 11:03:27PM +0200, Enrico Weigelt, metux IT consult wrote:
>> From: Enrico Weigelt <[email protected]>
>>
>> IS_ERR() already calls unlikely(), so this extra unlikely() call
>> around IS_ERR() is not needed.
>>
>> Signed-off-by: Enrico Weigelt <[email protected]>
>
> Hi,
>
> This patch overlaps with
> Jun 05 Kefeng Wang (4.4K) [PATCH net-next] net: Drop unlikely before IS_ERR(_OR_NULL)

I've missed Kefeng's patch ... feel free to ignore mine.


--mtx


--
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
[email protected] -- +49-151-27565287

2019-06-05 23:59:29

by David Miller

Subject: Re: [PATCH] net: sctp: drop unneeded likely() call around IS_ERR()

From: "Enrico Weigelt, metux IT consult" <[email protected]>
Date: Wed, 5 Jun 2019 23:03:27 +0200

> From: Enrico Weigelt <[email protected]>
>
> IS_ERR() already calls unlikely(), so this extra unlikely() call
> around IS_ERR() is not needed.
>
> Signed-off-by: Enrico Weigelt <[email protected]>

Skipping this because of the overlap...