diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2019-07-05 20:13:22 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-07-08 19:25:19 -0700 |
commit | 6d7855c54e1e269275d7c504f8f62a0b7a5b3f18 (patch) | |
tree | ea317c2fdec3842d1af4d8651b31c0a429f83cb2 /net/socket.c | |
parent | 17ccf9e31e0d650b36fdc06eb7b09757523111c7 (diff) | |
download | linux-6d7855c54e1e269275d7c504f8f62a0b7a5b3f18.tar.gz linux-6d7855c54e1e269275d7c504f8f62a0b7a5b3f18.tar.bz2 linux-6d7855c54e1e269275d7c504f8f62a0b7a5b3f18.zip |
sockfs: switch to ->free_inode()
we do have an RCU-delayed part there already (freeing the wq),
so it's not like the pipe situation; moreover, it might be
worth considering coallocating wq with the rest of struct sock_alloc.
->sk_wq in struct sock would remain a pointer as it is, but
the object it normally points to would be coallocated with
struct socket...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c index d97b74f762e8..541719a2443d 100644 --- a/net/socket.c +++ b/net/socket.c @@ -258,12 +258,12 @@ static struct inode *sock_alloc_inode(struct super_block *sb) return &ei->vfs_inode; } -static void sock_destroy_inode(struct inode *inode) +static void sock_free_inode(struct inode *inode) { struct socket_alloc *ei; ei = container_of(inode, struct socket_alloc, vfs_inode); - kfree_rcu(ei->socket.wq, rcu); + kfree(ei->socket.wq); kmem_cache_free(sock_inode_cachep, ei); } @@ -288,7 +288,7 @@ static void init_inodecache(void) static const struct super_operations sockfs_ops = { .alloc_inode = sock_alloc_inode, - .destroy_inode = sock_destroy_inode, + .free_inode = sock_free_inode, .statfs = simple_statfs, }; |