p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tipc: remove redundant timer defined in tipc_sock struct 

Remove the redundant timer defined in tipc_sock structure, instead we
can directly reuse the sk_timer defined in sock structure.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ying Xue 2015-01-13 17:07:48 +08:00 committed by David S. Miller
parent 49ff2d3f04
commit 3721e9c7c1
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/tipc/socket.c
View File

@ -69,7 +69,6 @@
* @pub_count: total # of publications port has made during its lifetime * @pub_count: total # of publications port has made during its lifetime
* @probing_state: * @probing_state:
* @probing_intv: * @probing_intv:
* @timer:
* @port: port - interacts with 'sk' and with the rest of the TIPC stack * @port: port - interacts with 'sk' and with the rest of the TIPC stack
* @peer_name: the peer of the connection, if any * @peer_name: the peer of the connection, if any
* @conn_timeout: the time we can wait for an unresponded setup request * @conn_timeout: the time we can wait for an unresponded setup request
@ -94,7 +93,6 @@ struct tipc_sock {
u32 pub_count; u32 pub_count;
u32 probing_state; u32 probing_state;
unsigned long probing_intv; unsigned long probing_intv;
struct timer_list timer;
uint conn_timeout; uint conn_timeout;
atomic_t dupl_rcvcnt; atomic_t dupl_rcvcnt;
bool link_cong; bool link_cong;
@ -360,7 +358,7 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
return -EINVAL; return -EINVAL;
} }
msg_set_origport(msg, tsk->portid); msg_set_origport(msg, tsk->portid);
setup_timer(&tsk->timer, tipc_sk_timeout, (unsigned long)tsk); setup_timer(&sk->sk_timer, tipc_sk_timeout, (unsigned long)tsk);
sk->sk_backlog_rcv = tipc_backlog_rcv; sk->sk_backlog_rcv = tipc_backlog_rcv;
sk->sk_rcvbuf = sysctl_tipc_rmem[1]; sk->sk_rcvbuf = sysctl_tipc_rmem[1];
sk->sk_data_ready = tipc_data_ready; sk->sk_data_ready = tipc_data_ready;
@ -514,7 +512,8 @@ static int tipc_release(struct socket *sock)
tipc_sk_withdraw(tsk, 0, NULL); tipc_sk_withdraw(tsk, 0, NULL);
probing_state = tsk->probing_state; probing_state = tsk->probing_state;
if (del_timer_sync(&tsk->timer) && probing_state != TIPC_CONN_PROBING) if (del_timer_sync(&sk->sk_timer) &&
probing_state != TIPC_CONN_PROBING)
sock_put(sk); sock_put(sk);
tipc_sk_remove(tsk); tipc_sk_remove(tsk);
if (tsk->connected) { if (tsk->connected) {
@ -1136,7 +1135,8 @@ static int tipc_send_packet(struct kiocb *iocb, struct socket *sock,
static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port, static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port,
u32 peer_node) u32 peer_node)
{ {
struct net *net = sock_net(&tsk->sk); struct sock *sk = &tsk->sk;
struct net *net = sock_net(sk);
struct tipc_msg *msg = &tsk->phdr; struct tipc_msg *msg = &tsk->phdr;
msg_set_destnode(msg, peer_node); msg_set_destnode(msg, peer_node);
@ -1148,8 +1148,7 @@ static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port,
tsk->probing_intv = CONN_PROBING_INTERVAL; tsk->probing_intv = CONN_PROBING_INTERVAL;
tsk->probing_state = TIPC_CONN_OK; tsk->probing_state = TIPC_CONN_OK;
tsk->connected = 1; tsk->connected = 1;
if (!mod_timer(&tsk->timer, jiffies + tsk->probing_intv)) sk_reset_timer(sk, &sk->sk_timer, jiffies + tsk->probing_intv);
sock_hold(&tsk->sk);
tipc_node_add_conn(net, peer_node, tsk->portid, peer_port); tipc_node_add_conn(net, peer_node, tsk->portid, peer_port);
tsk->max_pkt = tipc_node_get_mtu(net, peer_node, tsk->portid); tsk->max_pkt = tipc_node_get_mtu(net, peer_node, tsk->portid);
} }
@ -2141,8 +2140,7 @@ static void tipc_sk_timeout(unsigned long data)
0, peer_node, tn->own_addr, 0, peer_node, tn->own_addr,
peer_port, tsk->portid, TIPC_OK); peer_port, tsk->portid, TIPC_OK);
tsk->probing_state = TIPC_CONN_PROBING; tsk->probing_state = TIPC_CONN_PROBING;
if (!mod_timer(&tsk->timer, jiffies + tsk->probing_intv)) sk_reset_timer(sk, &sk->sk_timer, jiffies + tsk->probing_intv);
sock_hold(sk);
} }
bh_unlock_sock(sk); bh_unlock_sock(sk);
if (skb) if (skb)