lkml.org 
[lkml]   [2011]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 68/86] net,rcu: convert call_rcu(wq_free_rcu) to kfree_rcu()
    Date
    From: Lai Jiangshan <laijs@cn.fujitsu.com>

    The rcu callback wq_free_rcu() just calls a kfree(),
    so we use kfree_rcu() instead of the call_rcu(wq_free_rcu).

    Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
    Acked-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    net/socket.c | 11 +----------
    1 files changed, 1 insertions(+), 10 deletions(-)

    diff --git a/net/socket.c b/net/socket.c
    index 310d16b..c2ed7c9 100644
    --- a/net/socket.c
    +++ b/net/socket.c
    @@ -263,15 +263,6 @@ static struct inode *sock_alloc_inode(struct super_block *sb)
    return &ei->vfs_inode;
    }

    -
    -
    -static void wq_free_rcu(struct rcu_head *head)
    -{
    - struct socket_wq *wq = container_of(head, struct socket_wq, rcu);
    -
    - kfree(wq);
    -}
    -
    static void sock_destroy_inode(struct inode *inode)
    {
    struct socket_alloc *ei;
    @@ -279,7 +270,7 @@ static void sock_destroy_inode(struct inode *inode)

    ei = container_of(inode, struct socket_alloc, vfs_inode);
    wq = rcu_dereference_protected(ei->socket.wq, 1);
    - call_rcu(&wq->rcu, wq_free_rcu);
    + kfree_rcu(wq, rcu);
    kmem_cache_free(sock_inode_cachep, ei);
    }

    --
    1.7.3.2


    \
     
     \ /
      Last update: 2011-05-01 15:29    [W:0.240 / U:29.888 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site