Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed8bfd5c authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller
Browse files

VSOCK: remove unnecessary ternary operator on return value 



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: default avatarColin Ian King <colin.king@canonical.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarJorgen Hansen <jhansen@vmware.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 282ccf6e

net/vmw_vsock/vmci_transport.c

+7 −15
Original line number Diff line number Diff line
@@ -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)