Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25cc4ae9 authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

net: remove redundant check for timer pending state before del_timer 



As in del_timer() there has already placed a timer_pending() function
to check whether the timer to be deleted is pending or not, it's
unnecessary to check timer pending state again before del_timer() is
called.

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b3c9a85

net/bluetooth/rfcomm/core.c

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static void rfcomm_session_clear_timer(struct rfcomm_session *s) 
{

	BT_DBG("session %p state %ld", s, s->state);



	if (timer_pending(&s->timer) && del_timer(&s->timer))

	if (del_timer(&s->timer))

		rfcomm_session_put(s);

}
@@ -285,7 +285,7 @@ static void rfcomm_dlc_clear_timer(struct rfcomm_dlc *d) 
{

	BT_DBG("dlc %p state %ld", d, d->state);



	if (timer_pending(&d->timer) && del_timer(&d->timer))

	if (del_timer(&d->timer))

		rfcomm_dlc_put(d);

}

net/bridge/netfilter/ebt_ulog.c

+2 −4
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static void ulog_send(unsigned int nlgroup) 
{

	ebt_ulog_buff_t *ub = &ulog_buffers[nlgroup];



	if (timer_pending(&ub->timer))

	del_timer(&ub->timer);



	if (!ub->skb)
@@ -319,7 +318,6 @@ static void __exit ebt_ulog_fini(void) 
	xt_unregister_target(&ebt_ulog_tg_reg);

	for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {

		ub = &ulog_buffers[i];

		if (timer_pending(&ub->timer))

		del_timer(&ub->timer);

		spin_lock_bh(&ub->lock);

		if (ub->skb) {

net/core/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -2230,7 +2230,7 @@ EXPORT_SYMBOL(sk_reset_timer); 


void sk_stop_timer(struct sock *sk, struct timer_list* timer)

{

	if (timer_pending(timer) && del_timer(timer))

	if (del_timer(timer))

		__sock_put(sk);

}

EXPORT_SYMBOL(sk_stop_timer);

net/ipv4/netfilter/ipt_ULOG.c

+4 −8
Original line number Diff line number Diff line
@@ -88,10 +88,8 @@ static void ulog_send(unsigned int nlgroupnum) 
{

	ulog_buff_t *ub = &ulog_buffers[nlgroupnum];



	if (timer_pending(&ub->timer)) {

		pr_debug("ulog_send: timer was pending, deleting\n");

	pr_debug("ulog_send: timer is deleting\n");

	del_timer(&ub->timer);

	}



	if (!ub->skb) {

		pr_debug("ulog_send: nothing to send\n");
@@ -426,10 +424,8 @@ static void __exit ulog_tg_exit(void) 
	/* remove pending timers and free allocated skb's */

	for (i = 0; i < ULOG_MAXNLGROUPS; i++) {

		ub = &ulog_buffers[i];

		if (timer_pending(&ub->timer)) {

			pr_debug("timer was pending, deleting\n");

		pr_debug("timer is deleting\n");

		del_timer(&ub->timer);

		}



		if (ub->skb) {

			kfree_skb(ub->skb);

net/irda/af_irda.c

+1 −2
Original line number Diff line number Diff line
@@ -2567,7 +2567,6 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, 
						   err);



			/* If watchdog is still activated, kill it! */

			if(timer_pending(&(self->watchdog)))

			del_timer(&(self->watchdog));



			IRDA_DEBUG(1, "%s(), ...waking up !\n", __func__);