diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2013-05-05 16:03:46 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-06 11:06:51 -0400 |
| commit | 0020356355192cbaf6d315515e6c95bd09618c3b (patch) | |
| tree | 8437e2fe173620f1b08390a728fac5d64a2d0374 /net | |
| parent | b56141ab34e2c3e2d7960cea12c20c99530c0c76 (diff) | |
| download | talos-obmc-linux-0020356355192cbaf6d315515e6c95bd09618c3b.tar.gz talos-obmc-linux-0020356355192cbaf6d315515e6c95bd09618c3b.zip | |
fib_trie: no need to delay vfree()
Now that vfree() can be called from interrupt contexts, there's no
need to play games with schedule_work() to escape calling vfree()
from RCU callbacks.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/fib_trie.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index ff06b7543d9f..49616fed9340 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -125,7 +125,6 @@ struct tnode { unsigned int empty_children; /* KEYLENGTH bits needed */ union { struct rcu_head rcu; - struct work_struct work; struct tnode *tnode_free; }; struct rt_trie_node __rcu *child[0]; @@ -383,12 +382,6 @@ static struct tnode *tnode_alloc(size_t size) return vzalloc(size); } -static void __tnode_vfree(struct work_struct *arg) -{ - struct tnode *tn = container_of(arg, struct tnode, work); - vfree(tn); -} - static void __tnode_free_rcu(struct rcu_head *head) { struct tnode *tn = container_of(head, struct tnode, rcu); @@ -397,10 +390,8 @@ static void __tnode_free_rcu(struct rcu_head *head) if (size <= PAGE_SIZE) kfree(tn); - else { - INIT_WORK(&tn->work, __tnode_vfree); - schedule_work(&tn->work); - } + else + vfree(tn); } static inline void tnode_free(struct tnode *tn) |
