Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cecbb63967b4f36701b9412a12377e8fe006a93b
Commit:     cecbb63967b4f36701b9412a12377e8fe006a93b
Parent:     2dc2f207fb251666d2396fe1a69272b307ecc333
Author:     David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 20 16:39:03 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sun Jan 20 20:31:42 2008 -0800

    [NEIGH]: Revert 'Fix race between neigh_parms_release and 
neightbl_fill_parms'
    
    Commit 9cd40029423701c376391da59d2c6469672b4bed (Fix race between
    neigh_parms_release and neightbl_fill_parms) introduced device
    reference counting regressions for several people, see:
    
        http://bugzilla.kernel.org/show_bug.cgi?id=9778
    
    for example.
    
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/core/neighbour.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index cc8a2f1..29b8ee4 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1316,6 +1316,8 @@ void neigh_parms_release(struct neigh_table *tbl, struct 
neigh_parms *parms)
                        *p = parms->next;
                        parms->dead = 1;
                        write_unlock_bh(&tbl->lock);
+                       if (parms->dev)
+                               dev_put(parms->dev);
                        call_rcu(&parms->rcu_head, neigh_rcu_free_parms);
                        return;
                }
@@ -1326,8 +1328,6 @@ void neigh_parms_release(struct neigh_table *tbl, struct 
neigh_parms *parms)
 
 void neigh_parms_destroy(struct neigh_parms *parms)
 {
-       if (parms->dev)
-               dev_put(parms->dev);
        kfree(parms);
 }
 
-
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