|
@@ -66,19 +66,19 @@ void rds_tcp_xmit_complete(struct rds_connection *conn)
|
|
|
static int rds_tcp_sendmsg(struct socket *sock, void *data, unsigned int len)
|
|
|
{
|
|
|
struct kvec vec = {
|
|
|
- .iov_base = data,
|
|
|
- .iov_len = len,
|
|
|
+ .iov_base = data,
|
|
|
+ .iov_len = len,
|
|
|
+ };
|
|
|
+ struct msghdr msg = {
|
|
|
+ .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL,
|
|
|
};
|
|
|
- struct msghdr msg = {
|
|
|
- .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL,
|
|
|
- };
|
|
|
|
|
|
return kernel_sendmsg(sock, &msg, &vec, 1, vec.iov_len);
|
|
|
}
|
|
|
|
|
|
/* the core send_sem serializes this with other xmit and shutdown */
|
|
|
int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm,
|
|
|
- unsigned int hdr_off, unsigned int sg, unsigned int off)
|
|
|
+ unsigned int hdr_off, unsigned int sg, unsigned int off)
|
|
|
{
|
|
|
struct rds_tcp_connection *tc = conn->c_transport_data;
|
|
|
int done = 0;
|
|
@@ -196,7 +196,7 @@ void rds_tcp_write_space(struct sock *sk)
|
|
|
tc->t_last_seen_una = rds_tcp_snd_una(tc);
|
|
|
rds_send_drop_acked(conn, rds_tcp_snd_una(tc), rds_tcp_is_acked);
|
|
|
|
|
|
- if ((atomic_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf)
|
|
|
+ if ((atomic_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf)
|
|
|
queue_delayed_work(rds_wq, &conn->c_send_w, 0);
|
|
|
|
|
|
out:
|