net: rds: fix coding style issues
Fix coding style issues in the following files: ib_cm.c: add space loop.c: convert spaces to tabs sysctl.c: add space tcp.h: convert spaces to tabs tcp_connect.c:remove extra indentation in switch statement tcp_recv.c: convert spaces to tabs tcp_send.c: convert spaces to tabs transport.c: move brace up one line on for statement Signed-off-by: Joshua Houghton <josh@awful.name> Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4a7d99ea1b
commit
5c3da57d70
|
@ -111,7 +111,7 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (conn->c_version < RDS_PROTOCOL(3,1)) {
|
if (conn->c_version < RDS_PROTOCOL(3, 1)) {
|
||||||
printk(KERN_NOTICE "RDS/IB: Connection to %pI4 version %u.%u failed,"
|
printk(KERN_NOTICE "RDS/IB: Connection to %pI4 version %u.%u failed,"
|
||||||
" no longer supported\n",
|
" no longer supported\n",
|
||||||
&conn->c_faddr,
|
&conn->c_faddr,
|
||||||
|
|
|
@ -95,8 +95,9 @@ out:
|
||||||
*/
|
*/
|
||||||
static void rds_loop_inc_free(struct rds_incoming *inc)
|
static void rds_loop_inc_free(struct rds_incoming *inc)
|
||||||
{
|
{
|
||||||
struct rds_message *rm = container_of(inc, struct rds_message, m_inc);
|
struct rds_message *rm = container_of(inc, struct rds_message, m_inc);
|
||||||
rds_message_put(rm);
|
|
||||||
|
rds_message_put(rm);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* we need to at least give the thread something to succeed */
|
/* we need to at least give the thread something to succeed */
|
||||||
|
|
|
@ -102,7 +102,8 @@ int rds_sysctl_init(void)
|
||||||
rds_sysctl_reconnect_min = msecs_to_jiffies(1);
|
rds_sysctl_reconnect_min = msecs_to_jiffies(1);
|
||||||
rds_sysctl_reconnect_min_jiffies = rds_sysctl_reconnect_min;
|
rds_sysctl_reconnect_min_jiffies = rds_sysctl_reconnect_min;
|
||||||
|
|
||||||
rds_sysctl_reg_table = register_net_sysctl(&init_net,"net/rds", rds_sysctl_rds_table);
|
rds_sysctl_reg_table =
|
||||||
|
register_net_sysctl(&init_net, "net/rds", rds_sysctl_rds_table);
|
||||||
if (!rds_sysctl_reg_table)
|
if (!rds_sysctl_reg_table)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -83,7 +83,7 @@ int rds_tcp_inc_copy_to_user(struct rds_incoming *inc, struct iov_iter *to);
|
||||||
void rds_tcp_xmit_prepare(struct rds_connection *conn);
|
void rds_tcp_xmit_prepare(struct rds_connection *conn);
|
||||||
void rds_tcp_xmit_complete(struct rds_connection *conn);
|
void rds_tcp_xmit_complete(struct rds_connection *conn);
|
||||||
int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm,
|
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);
|
||||||
void rds_tcp_write_space(struct sock *sk);
|
void rds_tcp_write_space(struct sock *sk);
|
||||||
|
|
||||||
/* tcp_stats.c */
|
/* tcp_stats.c */
|
||||||
|
|
|
@ -54,19 +54,19 @@ void rds_tcp_state_change(struct sock *sk)
|
||||||
|
|
||||||
rdsdebug("sock %p state_change to %d\n", tc->t_sock, sk->sk_state);
|
rdsdebug("sock %p state_change to %d\n", tc->t_sock, sk->sk_state);
|
||||||
|
|
||||||
switch(sk->sk_state) {
|
switch (sk->sk_state) {
|
||||||
/* ignore connecting sockets as they make progress */
|
/* ignore connecting sockets as they make progress */
|
||||||
case TCP_SYN_SENT:
|
case TCP_SYN_SENT:
|
||||||
case TCP_SYN_RECV:
|
case TCP_SYN_RECV:
|
||||||
break;
|
break;
|
||||||
case TCP_ESTABLISHED:
|
case TCP_ESTABLISHED:
|
||||||
rds_connect_path_complete(conn, RDS_CONN_CONNECTING);
|
rds_connect_path_complete(conn, RDS_CONN_CONNECTING);
|
||||||
break;
|
break;
|
||||||
case TCP_CLOSE_WAIT:
|
case TCP_CLOSE_WAIT:
|
||||||
case TCP_CLOSE:
|
case TCP_CLOSE:
|
||||||
rds_conn_drop(conn);
|
rds_conn_drop(conn);
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
out:
|
out:
|
||||||
read_unlock_bh(&sk->sk_callback_lock);
|
read_unlock_bh(&sk->sk_callback_lock);
|
||||||
|
|
|
@ -171,7 +171,7 @@ static int rds_tcp_data_recv(read_descriptor_t *desc, struct sk_buff *skb,
|
||||||
while (left) {
|
while (left) {
|
||||||
if (!tinc) {
|
if (!tinc) {
|
||||||
tinc = kmem_cache_alloc(rds_tcp_incoming_slab,
|
tinc = kmem_cache_alloc(rds_tcp_incoming_slab,
|
||||||
arg->gfp);
|
arg->gfp);
|
||||||
if (!tinc) {
|
if (!tinc) {
|
||||||
desc->error = -ENOMEM;
|
desc->error = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
|
|
|
@ -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)
|
static int rds_tcp_sendmsg(struct socket *sock, void *data, unsigned int len)
|
||||||
{
|
{
|
||||||
struct kvec vec = {
|
struct kvec vec = {
|
||||||
.iov_base = data,
|
.iov_base = data,
|
||||||
.iov_len = len,
|
.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);
|
return kernel_sendmsg(sock, &msg, &vec, 1, vec.iov_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* the core send_sem serializes this with other xmit and shutdown */
|
/* the core send_sem serializes this with other xmit and shutdown */
|
||||||
int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm,
|
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;
|
struct rds_tcp_connection *tc = conn->c_transport_data;
|
||||||
int done = 0;
|
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);
|
tc->t_last_seen_una = rds_tcp_snd_una(tc);
|
||||||
rds_send_drop_acked(conn, rds_tcp_snd_una(tc), rds_tcp_is_acked);
|
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);
|
queue_delayed_work(rds_wq, &conn->c_send_w, 0);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -140,8 +140,7 @@ unsigned int rds_trans_stats_info_copy(struct rds_info_iterator *iter,
|
||||||
rds_info_iter_unmap(iter);
|
rds_info_iter_unmap(iter);
|
||||||
down_read(&rds_trans_sem);
|
down_read(&rds_trans_sem);
|
||||||
|
|
||||||
for (i = 0; i < RDS_TRANS_COUNT; i++)
|
for (i = 0; i < RDS_TRANS_COUNT; i++) {
|
||||||
{
|
|
||||||
trans = transports[i];
|
trans = transports[i];
|
||||||
if (!trans || !trans->stats_info_copy)
|
if (!trans || !trans->stats_info_copy)
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in New Issue