From b7807b3c48e399ffb441215d67a8c7bf7d9d4a22 Mon Sep 17 00:00:00 2001 From: eeb Date: Fri, 17 Oct 2003 13:19:43 +0000 Subject: [PATCH] * Applied fix for 2119 --- lnet/klnds/qswlnd/qswlnd_cb.c | 16 ++++------------ lnet/klnds/socklnd/socklnd.c | 6 ++---- lnet/klnds/socklnd/socklnd_cb.c | 23 +++++++---------------- lustre/portals/knals/qswnal/qswnal_cb.c | 16 ++++------------ lustre/portals/knals/socknal/socknal.c | 6 ++---- lustre/portals/knals/socknal/socknal_cb.c | 23 +++++++---------------- 6 files changed, 26 insertions(+), 64 deletions(-) diff --git a/lnet/klnds/qswlnd/qswlnd_cb.c b/lnet/klnds/qswlnd/qswlnd_cb.c index 6e19783..006ea49 100644 --- a/lnet/klnds/qswlnd/qswlnd_cb.c +++ b/lnet/klnds/qswlnd/qswlnd_cb.c @@ -330,12 +330,7 @@ kqswnal_put_idle_tx (kqswnal_tx_t *ktx) list_del (&fwd->kprfd_list); } - if (waitqueue_active (&kqswnal_data.kqn_idletxd_waitq)) /* process? */ - { - /* local sender waiting for tx desc */ - CDEBUG(D_NET,"wakeup process\n"); - wake_up (&kqswnal_data.kqn_idletxd_waitq); - } + wake_up (&kqswnal_data.kqn_idletxd_waitq); spin_unlock_irqrestore (&kqswnal_data.kqn_idletxd_lock, flags); @@ -346,8 +341,7 @@ kqswnal_put_idle_tx (kqswnal_tx_t *ktx) spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags); list_add_tail (&fwd->kprfd_list, &kqswnal_data.kqn_delayedfwds); - if (waitqueue_active (&kqswnal_data.kqn_sched_waitq)) - wake_up (&kqswnal_data.kqn_sched_waitq); + wake_up (&kqswnal_data.kqn_sched_waitq); spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags); } @@ -514,8 +508,7 @@ kqswnal_launch (kqswnal_tx_t *ktx) spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags); list_add_tail (&ktx->ktx_delayed_list, &kqswnal_data.kqn_delayedtxds); - if (waitqueue_active (&kqswnal_data.kqn_sched_waitq)) - wake_up (&kqswnal_data.kqn_sched_waitq); + wake_up (&kqswnal_data.kqn_sched_waitq); spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags); return (0); @@ -1244,8 +1237,7 @@ kqswnal_rxhandler(EP_RXD *rxd) spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags); list_add_tail (&krx->krx_list, &kqswnal_data.kqn_readyrxds); - if (waitqueue_active (&kqswnal_data.kqn_sched_waitq)) - wake_up (&kqswnal_data.kqn_sched_waitq); + wake_up (&kqswnal_data.kqn_sched_waitq); spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags); } diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c index 345882d..3d0c758 100644 --- a/lnet/klnds/socklnd/socklnd.c +++ b/lnet/klnds/socklnd/socklnd.c @@ -864,8 +864,7 @@ ksocknal_close_conn_locked (ksock_conn_t *conn, int error) spin_lock (&ksocknal_data.ksnd_reaper_lock); list_add_tail (&conn->ksnc_list, &ksocknal_data.ksnd_deathrow_conns); - if (waitqueue_active (&ksocknal_data.ksnd_reaper_waitq)) - wake_up (&ksocknal_data.ksnd_reaper_waitq); + wake_up (&ksocknal_data.ksnd_reaper_waitq); spin_unlock (&ksocknal_data.ksnd_reaper_lock); } @@ -1007,8 +1006,7 @@ ksocknal_put_conn (ksock_conn_t *conn) spin_lock_irqsave (&ksocknal_data.ksnd_reaper_lock, flags); list_add (&conn->ksnc_list, &ksocknal_data.ksnd_zombie_conns); - if (waitqueue_active (&ksocknal_data.ksnd_reaper_waitq)) - wake_up (&ksocknal_data.ksnd_reaper_waitq); + wake_up (&ksocknal_data.ksnd_reaper_waitq); spin_unlock_irqrestore (&ksocknal_data.ksnd_reaper_lock, flags); } diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c index a654694..10520f5 100644 --- a/lnet/klnds/socklnd/socklnd_cb.c +++ b/lnet/klnds/socklnd/socklnd_cb.c @@ -179,8 +179,7 @@ ksocknal_put_ltx (ksock_ltx_t *ltx) list_add_tail (<x->ltx_tx.tx_list, ltx->ltx_idle); /* normal tx desc => wakeup anyone blocking for one */ - if (ltx->ltx_idle == &ksocknal_data.ksnd_idle_ltx_list && - waitqueue_active (&ksocknal_data.ksnd_idle_ltx_waitq)) + if (ltx->ltx_idle == &ksocknal_data.ksnd_idle_ltx_list) wake_up (&ksocknal_data.ksnd_idle_ltx_waitq); spin_unlock_irqrestore (&ksocknal_data.ksnd_idle_ltx_lock, flags); @@ -627,8 +626,7 @@ ksocknal_zc_callback (zccd_t *zcd) spin_lock_irqsave (&sched->kss_lock, flags); list_add_tail (&tx->tx_list, &sched->kss_zctxdone_list); - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); spin_unlock_irqrestore (&sched->kss_lock, flags); EXIT; @@ -776,9 +774,7 @@ ksocknal_launch_autoconnect_locked (ksock_route_t *route) list_add_tail (&route->ksnr_connect_list, &ksocknal_data.ksnd_autoconnectd_routes); - - if (waitqueue_active (&ksocknal_data.ksnd_autoconnectd_waitq)) - wake_up (&ksocknal_data.ksnd_autoconnectd_waitq); + wake_up (&ksocknal_data.ksnd_autoconnectd_waitq); spin_unlock_irqrestore (&ksocknal_data.ksnd_autoconnectd_lock, flags); } @@ -867,8 +863,7 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn) list_add_tail (&conn->ksnc_tx_list, &sched->kss_tx_conns); conn->ksnc_tx_scheduled = 1; - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); } spin_unlock_irqrestore (&sched->kss_lock, flags); @@ -1209,9 +1204,7 @@ ksocknal_fmb_callback (void *arg, int error) spin_lock_irqsave (&sched->kss_lock, flags); list_add_tail (&conn->ksnc_rx_list, &sched->kss_rx_conns); - - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); spin_unlock_irqrestore (&sched->kss_lock, flags); } @@ -1797,8 +1790,7 @@ ksocknal_data_ready (struct sock *sk, int n) /* extra ref for scheduler */ atomic_inc (&conn->ksnc_refcount); - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); } spin_unlock_irqrestore (&sched->kss_lock, flags); @@ -1862,8 +1854,7 @@ ksocknal_write_space (struct sock *sk) /* extra ref for scheduler */ atomic_inc (&conn->ksnc_refcount); - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); } spin_unlock_irqrestore (&sched->kss_lock, flags); diff --git a/lustre/portals/knals/qswnal/qswnal_cb.c b/lustre/portals/knals/qswnal/qswnal_cb.c index 6e19783..006ea49 100644 --- a/lustre/portals/knals/qswnal/qswnal_cb.c +++ b/lustre/portals/knals/qswnal/qswnal_cb.c @@ -330,12 +330,7 @@ kqswnal_put_idle_tx (kqswnal_tx_t *ktx) list_del (&fwd->kprfd_list); } - if (waitqueue_active (&kqswnal_data.kqn_idletxd_waitq)) /* process? */ - { - /* local sender waiting for tx desc */ - CDEBUG(D_NET,"wakeup process\n"); - wake_up (&kqswnal_data.kqn_idletxd_waitq); - } + wake_up (&kqswnal_data.kqn_idletxd_waitq); spin_unlock_irqrestore (&kqswnal_data.kqn_idletxd_lock, flags); @@ -346,8 +341,7 @@ kqswnal_put_idle_tx (kqswnal_tx_t *ktx) spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags); list_add_tail (&fwd->kprfd_list, &kqswnal_data.kqn_delayedfwds); - if (waitqueue_active (&kqswnal_data.kqn_sched_waitq)) - wake_up (&kqswnal_data.kqn_sched_waitq); + wake_up (&kqswnal_data.kqn_sched_waitq); spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags); } @@ -514,8 +508,7 @@ kqswnal_launch (kqswnal_tx_t *ktx) spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags); list_add_tail (&ktx->ktx_delayed_list, &kqswnal_data.kqn_delayedtxds); - if (waitqueue_active (&kqswnal_data.kqn_sched_waitq)) - wake_up (&kqswnal_data.kqn_sched_waitq); + wake_up (&kqswnal_data.kqn_sched_waitq); spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags); return (0); @@ -1244,8 +1237,7 @@ kqswnal_rxhandler(EP_RXD *rxd) spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags); list_add_tail (&krx->krx_list, &kqswnal_data.kqn_readyrxds); - if (waitqueue_active (&kqswnal_data.kqn_sched_waitq)) - wake_up (&kqswnal_data.kqn_sched_waitq); + wake_up (&kqswnal_data.kqn_sched_waitq); spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags); } diff --git a/lustre/portals/knals/socknal/socknal.c b/lustre/portals/knals/socknal/socknal.c index 345882d..3d0c758 100644 --- a/lustre/portals/knals/socknal/socknal.c +++ b/lustre/portals/knals/socknal/socknal.c @@ -864,8 +864,7 @@ ksocknal_close_conn_locked (ksock_conn_t *conn, int error) spin_lock (&ksocknal_data.ksnd_reaper_lock); list_add_tail (&conn->ksnc_list, &ksocknal_data.ksnd_deathrow_conns); - if (waitqueue_active (&ksocknal_data.ksnd_reaper_waitq)) - wake_up (&ksocknal_data.ksnd_reaper_waitq); + wake_up (&ksocknal_data.ksnd_reaper_waitq); spin_unlock (&ksocknal_data.ksnd_reaper_lock); } @@ -1007,8 +1006,7 @@ ksocknal_put_conn (ksock_conn_t *conn) spin_lock_irqsave (&ksocknal_data.ksnd_reaper_lock, flags); list_add (&conn->ksnc_list, &ksocknal_data.ksnd_zombie_conns); - if (waitqueue_active (&ksocknal_data.ksnd_reaper_waitq)) - wake_up (&ksocknal_data.ksnd_reaper_waitq); + wake_up (&ksocknal_data.ksnd_reaper_waitq); spin_unlock_irqrestore (&ksocknal_data.ksnd_reaper_lock, flags); } diff --git a/lustre/portals/knals/socknal/socknal_cb.c b/lustre/portals/knals/socknal/socknal_cb.c index a654694..10520f5 100644 --- a/lustre/portals/knals/socknal/socknal_cb.c +++ b/lustre/portals/knals/socknal/socknal_cb.c @@ -179,8 +179,7 @@ ksocknal_put_ltx (ksock_ltx_t *ltx) list_add_tail (<x->ltx_tx.tx_list, ltx->ltx_idle); /* normal tx desc => wakeup anyone blocking for one */ - if (ltx->ltx_idle == &ksocknal_data.ksnd_idle_ltx_list && - waitqueue_active (&ksocknal_data.ksnd_idle_ltx_waitq)) + if (ltx->ltx_idle == &ksocknal_data.ksnd_idle_ltx_list) wake_up (&ksocknal_data.ksnd_idle_ltx_waitq); spin_unlock_irqrestore (&ksocknal_data.ksnd_idle_ltx_lock, flags); @@ -627,8 +626,7 @@ ksocknal_zc_callback (zccd_t *zcd) spin_lock_irqsave (&sched->kss_lock, flags); list_add_tail (&tx->tx_list, &sched->kss_zctxdone_list); - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); spin_unlock_irqrestore (&sched->kss_lock, flags); EXIT; @@ -776,9 +774,7 @@ ksocknal_launch_autoconnect_locked (ksock_route_t *route) list_add_tail (&route->ksnr_connect_list, &ksocknal_data.ksnd_autoconnectd_routes); - - if (waitqueue_active (&ksocknal_data.ksnd_autoconnectd_waitq)) - wake_up (&ksocknal_data.ksnd_autoconnectd_waitq); + wake_up (&ksocknal_data.ksnd_autoconnectd_waitq); spin_unlock_irqrestore (&ksocknal_data.ksnd_autoconnectd_lock, flags); } @@ -867,8 +863,7 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn) list_add_tail (&conn->ksnc_tx_list, &sched->kss_tx_conns); conn->ksnc_tx_scheduled = 1; - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); } spin_unlock_irqrestore (&sched->kss_lock, flags); @@ -1209,9 +1204,7 @@ ksocknal_fmb_callback (void *arg, int error) spin_lock_irqsave (&sched->kss_lock, flags); list_add_tail (&conn->ksnc_rx_list, &sched->kss_rx_conns); - - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); spin_unlock_irqrestore (&sched->kss_lock, flags); } @@ -1797,8 +1790,7 @@ ksocknal_data_ready (struct sock *sk, int n) /* extra ref for scheduler */ atomic_inc (&conn->ksnc_refcount); - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); } spin_unlock_irqrestore (&sched->kss_lock, flags); @@ -1862,8 +1854,7 @@ ksocknal_write_space (struct sock *sk) /* extra ref for scheduler */ atomic_inc (&conn->ksnc_refcount); - if (waitqueue_active (&sched->kss_waitq)) - wake_up (&sched->kss_waitq); + wake_up (&sched->kss_waitq); } spin_unlock_irqrestore (&sched->kss_lock, flags); -- 1.8.3.1