Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=25442cafb8cc3d979418caccabc91260707a0947
Commit:     25442cafb8cc3d979418caccabc91260707a0947
Parent:     94b83419e5b56a87410fd9c9939f0081fc155d65
Author:     Jarek Poplawski <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 5 17:42:44 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Jul 5 17:42:44 2007 -0700

    [NETPOLL]: Fixups for 'fix soft lockup when removing module'
    
    >From my recent patch:
    
    > >    #1
    > >    Until kernel ver. 2.6.21 (including) cancel_rearming_delayed_work()
    > >    required a work function should always (unconditionally) rearm with
    > >    delay > 0 - otherwise it would endlessly loop. This patch replaces
    > >    this function with cancel_delayed_work(). Later kernel versions don't
    > >    require this, so here it's only for uniformity.
    
    But Oleg Nesterov <[EMAIL PROTECTED]> found:
    
    > But 2.6.22 doesn't need this change, why it was merged?
    >
    > In fact, I suspect this change adds a race,
    ...
    
    His description was right (thanks), so this patch reverts #1.
    
    Signed-off-by: Jarek Poplawski <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/core/netpoll.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index cf40ff9..a0efdd7 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -72,8 +72,7 @@ static void queue_process(struct work_struct *work)
                        netif_tx_unlock(dev);
                        local_irq_restore(flags);
 
-                       if (atomic_read(&npinfo->refcnt))
-                               schedule_delayed_work(&npinfo->tx_work, HZ/10);
+                       schedule_delayed_work(&npinfo->tx_work, HZ/10);
                        return;
                }
                netif_tx_unlock(dev);
@@ -786,8 +785,7 @@ void netpoll_cleanup(struct netpoll *np)
                        if (atomic_dec_and_test(&npinfo->refcnt)) {
                                skb_queue_purge(&npinfo->arp_tx);
                                skb_queue_purge(&npinfo->txq);
-                               cancel_delayed_work(&npinfo->tx_work);
-                               flush_scheduled_work();
+                               cancel_rearming_delayed_work(&npinfo->tx_work);
 
                                /* clean after last, unfinished work */
                                if (!skb_queue_empty(&npinfo->txq)) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to