diff options
author | Eric Dumazet <edumazet@google.com> | 2016-08-23 12:57:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-08-23 20:46:17 -0400 |
commit | 75d855a5e93e6f3d9b37a8719d69a5318f051453 (patch) | |
tree | fa033d6cfcf5a6d7f273998ace36c144b4445f2b | |
parent | 232cb53a45965f8789fbf0a9a1962f8c67ab1a3c (diff) |
udp: get rid of SLAB_DESTROY_BY_RCU allocations
After commit ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU")
we do not need this special allocation mode anymore, even if it is
harmless.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/udp.c | 1 | ||||
-rw-r--r-- | net/ipv4/udplite.c | 1 | ||||
-rw-r--r-- | net/ipv6/udp.c | 1 | ||||
-rw-r--r-- | net/ipv6/udplite.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 00d18c57c83c..5fdcb8d108d4 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -2216,7 +2216,6 @@ struct proto udp_prot = { | |||
2216 | .sysctl_wmem = &sysctl_udp_wmem_min, | 2216 | .sysctl_wmem = &sysctl_udp_wmem_min, |
2217 | .sysctl_rmem = &sysctl_udp_rmem_min, | 2217 | .sysctl_rmem = &sysctl_udp_rmem_min, |
2218 | .obj_size = sizeof(struct udp_sock), | 2218 | .obj_size = sizeof(struct udp_sock), |
2219 | .slab_flags = SLAB_DESTROY_BY_RCU, | ||
2220 | .h.udp_table = &udp_table, | 2219 | .h.udp_table = &udp_table, |
2221 | #ifdef CONFIG_COMPAT | 2220 | #ifdef CONFIG_COMPAT |
2222 | .compat_setsockopt = compat_udp_setsockopt, | 2221 | .compat_setsockopt = compat_udp_setsockopt, |
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c index 3b3efbda48e1..2eea073e27ef 100644 --- a/net/ipv4/udplite.c +++ b/net/ipv4/udplite.c | |||
@@ -55,7 +55,6 @@ struct proto udplite_prot = { | |||
55 | .unhash = udp_lib_unhash, | 55 | .unhash = udp_lib_unhash, |
56 | .get_port = udp_v4_get_port, | 56 | .get_port = udp_v4_get_port, |
57 | .obj_size = sizeof(struct udp_sock), | 57 | .obj_size = sizeof(struct udp_sock), |
58 | .slab_flags = SLAB_DESTROY_BY_RCU, | ||
59 | .h.udp_table = &udplite_table, | 58 | .h.udp_table = &udplite_table, |
60 | #ifdef CONFIG_COMPAT | 59 | #ifdef CONFIG_COMPAT |
61 | .compat_setsockopt = compat_udp_setsockopt, | 60 | .compat_setsockopt = compat_udp_setsockopt, |
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 81e2f98b958d..19ac3a1c308d 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -1460,7 +1460,6 @@ struct proto udpv6_prot = { | |||
1460 | .sysctl_wmem = &sysctl_udp_wmem_min, | 1460 | .sysctl_wmem = &sysctl_udp_wmem_min, |
1461 | .sysctl_rmem = &sysctl_udp_rmem_min, | 1461 | .sysctl_rmem = &sysctl_udp_rmem_min, |
1462 | .obj_size = sizeof(struct udp6_sock), | 1462 | .obj_size = sizeof(struct udp6_sock), |
1463 | .slab_flags = SLAB_DESTROY_BY_RCU, | ||
1464 | .h.udp_table = &udp_table, | 1463 | .h.udp_table = &udp_table, |
1465 | #ifdef CONFIG_COMPAT | 1464 | #ifdef CONFIG_COMPAT |
1466 | .compat_setsockopt = compat_udpv6_setsockopt, | 1465 | .compat_setsockopt = compat_udpv6_setsockopt, |
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c index 9cf097e206e9..fd6ef414899b 100644 --- a/net/ipv6/udplite.c +++ b/net/ipv6/udplite.c | |||
@@ -50,7 +50,6 @@ struct proto udplitev6_prot = { | |||
50 | .unhash = udp_lib_unhash, | 50 | .unhash = udp_lib_unhash, |
51 | .get_port = udp_v6_get_port, | 51 | .get_port = udp_v6_get_port, |
52 | .obj_size = sizeof(struct udp6_sock), | 52 | .obj_size = sizeof(struct udp6_sock), |
53 | .slab_flags = SLAB_DESTROY_BY_RCU, | ||
54 | .h.udp_table = &udplite_table, | 53 | .h.udp_table = &udplite_table, |
55 | #ifdef CONFIG_COMPAT | 54 | #ifdef CONFIG_COMPAT |
56 | .compat_setsockopt = compat_udpv6_setsockopt, | 55 | .compat_setsockopt = compat_udpv6_setsockopt, |