summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2017-08-29 10:18:43 +0100
committerDavid Howells <dhowells@redhat.com>2017-08-29 10:55:20 +0100
commitbd2db2d231b4a9daccdba6712c3113e650260c6c (patch)
tree6eb87644236dfd48d5e8c62d2fdf1d9f87c3b079 /net
parent7b674e390e513ea443c5a0f27ec95e93fb8a94fa (diff)
downloadlinux-bd2db2d231b4a9daccdba6712c3113e650260c6c.tar.bz2
rxrpc: Don't negate call->error before returning it
call->error is stored as 0 or a negative error code. Don't negate this value (ie. make it positive) before returning it from a kernel function (though it should still be negated before passing to userspace through a control message). Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/rxrpc/sendmsg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c
index b0d2cda6ec0a..bc7f0241d92b 100644
--- a/net/rxrpc/sendmsg.c
+++ b/net/rxrpc/sendmsg.c
@@ -61,7 +61,7 @@ static int rxrpc_wait_for_tx_window(struct rxrpc_sock *rx,
call->cong_cwnd + call->cong_extra))
break;
if (call->state >= RXRPC_CALL_COMPLETE) {
- ret = -call->error;
+ ret = call->error;
break;
}
if (signal_pending(current)) {
@@ -364,8 +364,8 @@ out:
call_terminated:
rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
- _leave(" = %d", -call->error);
- return -call->error;
+ _leave(" = %d", call->error);
+ return call->error;
maybe_error:
if (copied)
@@ -660,7 +660,7 @@ int rxrpc_kernel_send_data(struct socket *sock, struct rxrpc_call *call,
break;
case RXRPC_CALL_COMPLETE:
read_lock_bh(&call->state_lock);
- ret = -call->error;
+ ret = call->error;
read_unlock_bh(&call->state_lock);
break;
default: