浏览代码

[TIPC]: Simplify code for returning partial success of stream send request.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Allan Stephens 19 年之前
父节点
当前提交
a3b0a5a9d0
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      net/tipc/socket.c

+ 2 - 2
net/tipc/socket.c

@@ -969,7 +969,7 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock,
 restart:
 restart:
 	if (unlikely((skb_queue_len(&sock->sk->sk_receive_queue) == 0) &&
 	if (unlikely((skb_queue_len(&sock->sk->sk_receive_queue) == 0) &&
 		     (flags & MSG_DONTWAIT))) {
 		     (flags & MSG_DONTWAIT))) {
-		res = (sz_copied == 0) ? -EWOULDBLOCK : 0;
+		res = -EWOULDBLOCK;
 		goto exit;
 		goto exit;
 	}
 	}
 
 
@@ -1060,7 +1060,7 @@ restart:
 
 
 exit:
 exit:
 	up(&tsock->sem);
 	up(&tsock->sem);
-	return res ? res : sz_copied;
+	return sz_copied ? sz_copied : res;
 }
 }
 
 
 /**
 /**