* [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value
@ 2017-03-29 15:33 Colin King
2017-03-29 18:35 ` Stefan Hajnoczi
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Colin King @ 2017-03-29 15:33 UTC (permalink / raw)
To: David S . Miller, Jorgen Hansen, Michael S . Tsirkin,
Adit Ranadive, George Zhang, Stefan Hajnoczi, Julia Lawall,
netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Rather than assign the positive errno values to ret and then
checking if it is positive and flip the sign, just return the
errno value.
Detected by CoverityScan, CID#986649 ("Logically Dead Code")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
net/vmw_vsock/vmci_transport.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 4be4fbbc0b50..10ae7823a19d 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -96,31 +96,23 @@ static int PROTOCOL_OVERRIDE = -1;
static s32 vmci_transport_error_to_vsock_error(s32 vmci_error)
{
- int err;
-
switch (vmci_error) {
case VMCI_ERROR_NO_MEM:
- err = ENOMEM;
- break;
+ return -ENOMEM;
case VMCI_ERROR_DUPLICATE_ENTRY:
case VMCI_ERROR_ALREADY_EXISTS:
- err = EADDRINUSE;
- break;
+ return -EADDRINUSE;
case VMCI_ERROR_NO_ACCESS:
- err = EPERM;
- break;
+ return -EPERM;
case VMCI_ERROR_NO_RESOURCES:
- err = ENOBUFS;
- break;
+ return -ENOBUFS;
case VMCI_ERROR_INVALID_RESOURCE:
- err = EHOSTUNREACH;
- break;
+ return -EHOSTUNREACH;
case VMCI_ERROR_INVALID_ARGS:
default:
- err = EINVAL;
+ break;
}
-
- return err > 0 ? -err : err;
+ return -EINVAL;
}
static u32 vmci_transport_peer_rid(u32 peer_cid)
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value
2017-03-29 15:33 [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value Colin King
@ 2017-03-29 18:35 ` Stefan Hajnoczi
2017-03-30 13:18 ` Jorgen S. Hansen
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Stefan Hajnoczi @ 2017-03-29 18:35 UTC (permalink / raw)
To: Colin King
Cc: David S . Miller, Jorgen Hansen, Michael S . Tsirkin,
Adit Ranadive, George Zhang, Julia Lawall, netdev,
kernel-janitors, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 570 bytes --]
On Wed, Mar 29, 2017 at 04:33:55PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Rather than assign the positive errno values to ret and then
> checking if it is positive and flip the sign, just return the
> errno value.
>
> Detected by CoverityScan, CID#986649 ("Logically Dead Code")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> net/vmw_vsock/vmci_transport.c | 22 +++++++---------------
> 1 file changed, 7 insertions(+), 15 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value
2017-03-29 15:33 [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value Colin King
2017-03-29 18:35 ` Stefan Hajnoczi
@ 2017-03-30 13:18 ` Jorgen S. Hansen
2017-03-30 13:22 ` Michael S. Tsirkin
2017-03-30 18:07 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Jorgen S. Hansen @ 2017-03-30 13:18 UTC (permalink / raw)
To: Colin King
Cc: David S . Miller, Michael S . Tsirkin, Adit Ranadive,
George Zhang, Stefan Hajnoczi, Julia Lawall,
netdev@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org
> On Mar 29, 2017, at 5:33 PM, Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> Rather than assign the positive errno values to ret and then
> checking if it is positive and flip the sign, just return the
> errno value.
>
> Detected by CoverityScan, CID#986649 ("Logically Dead Code")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> net/vmw_vsock/vmci_transport.c | 22 +++++++---------------
> 1 file changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
> index 4be4fbbc0b50..10ae7823a19d 100644
> --- a/net/vmw_vsock/vmci_transport.c
> +++ b/net/vmw_vsock/vmci_transport.c
> @@ -96,31 +96,23 @@ static int PROTOCOL_OVERRIDE = -1;
>
> static s32 vmci_transport_error_to_vsock_error(s32 vmci_error)
> {
> - int err;
> -
> switch (vmci_error) {
> case VMCI_ERROR_NO_MEM:
> - err = ENOMEM;
> - break;
> + return -ENOMEM;
> case VMCI_ERROR_DUPLICATE_ENTRY:
> case VMCI_ERROR_ALREADY_EXISTS:
> - err = EADDRINUSE;
> - break;
> + return -EADDRINUSE;
> case VMCI_ERROR_NO_ACCESS:
> - err = EPERM;
> - break;
> + return -EPERM;
> case VMCI_ERROR_NO_RESOURCES:
> - err = ENOBUFS;
> - break;
> + return -ENOBUFS;
> case VMCI_ERROR_INVALID_RESOURCE:
> - err = EHOSTUNREACH;
> - break;
> + return -EHOSTUNREACH;
> case VMCI_ERROR_INVALID_ARGS:
> default:
> - err = EINVAL;
> + break;
> }
> -
> - return err > 0 ? -err : err;
> + return -EINVAL;
> }
>
> static u32 vmci_transport_peer_rid(u32 peer_cid)
> --
> 2.11.0
>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value
2017-03-29 15:33 [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value Colin King
2017-03-29 18:35 ` Stefan Hajnoczi
2017-03-30 13:18 ` Jorgen S. Hansen
@ 2017-03-30 13:22 ` Michael S. Tsirkin
2017-03-30 18:07 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2017-03-30 13:22 UTC (permalink / raw)
To: Colin King
Cc: David S . Miller, Jorgen Hansen, Adit Ranadive, George Zhang,
Stefan Hajnoczi, Julia Lawall, netdev, kernel-janitors,
linux-kernel
On Wed, Mar 29, 2017 at 04:33:55PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Rather than assign the positive errno values to ret and then
> checking if it is positive and flip the sign, just return the
> errno value.
>
> Detected by CoverityScan, CID#986649 ("Logically Dead Code")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> net/vmw_vsock/vmci_transport.c | 22 +++++++---------------
> 1 file changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
> index 4be4fbbc0b50..10ae7823a19d 100644
> --- a/net/vmw_vsock/vmci_transport.c
> +++ b/net/vmw_vsock/vmci_transport.c
> @@ -96,31 +96,23 @@ static int PROTOCOL_OVERRIDE = -1;
>
> static s32 vmci_transport_error_to_vsock_error(s32 vmci_error)
> {
> - int err;
> -
> switch (vmci_error) {
> case VMCI_ERROR_NO_MEM:
> - err = ENOMEM;
> - break;
> + return -ENOMEM;
> case VMCI_ERROR_DUPLICATE_ENTRY:
> case VMCI_ERROR_ALREADY_EXISTS:
> - err = EADDRINUSE;
> - break;
> + return -EADDRINUSE;
> case VMCI_ERROR_NO_ACCESS:
> - err = EPERM;
> - break;
> + return -EPERM;
> case VMCI_ERROR_NO_RESOURCES:
> - err = ENOBUFS;
> - break;
> + return -ENOBUFS;
> case VMCI_ERROR_INVALID_RESOURCE:
> - err = EHOSTUNREACH;
> - break;
> + return -EHOSTUNREACH;
> case VMCI_ERROR_INVALID_ARGS:
> default:
> - err = EINVAL;
> + break;
> }
> -
> - return err > 0 ? -err : err;
> + return -EINVAL;
> }
>
> static u32 vmci_transport_peer_rid(u32 peer_cid)
> --
> 2.11.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value
2017-03-29 15:33 [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value Colin King
` (2 preceding siblings ...)
2017-03-30 13:22 ` Michael S. Tsirkin
@ 2017-03-30 18:07 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2017-03-30 18:07 UTC (permalink / raw)
To: colin.king
Cc: jhansen, mst, aditr, georgezhang, stefanha, julia.lawall, netdev,
kernel-janitors, linux-kernel
From: Colin King <colin.king@canonical.com>
Date: Wed, 29 Mar 2017 16:33:55 +0100
> From: Colin Ian King <colin.king@canonical.com>
>
> Rather than assign the positive errno values to ret and then
> checking if it is positive and flip the sign, just return the
> errno value.
>
> Detected by CoverityScan, CID#986649 ("Logically Dead Code")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-30 18:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-29 15:33 [PATCH][V2] VSOCK: remove unnecessary ternary operator on return value Colin King
2017-03-29 18:35 ` Stefan Hajnoczi
2017-03-30 13:18 ` Jorgen S. Hansen
2017-03-30 13:22 ` Michael S. Tsirkin
2017-03-30 18:07 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).