diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-08-26 22:25:52 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 18:18:19 -0400 |
commit | e5d679f33900c71d1a76ba07c5b04055abd34480 (patch) | |
tree | fb581f7156870056dbb91feaab9d3dd22fdcf61e /net/ipv4 | |
parent | ff5dfe736dd9f6c74b206aa77c0465dfd503bdb9 (diff) |
[NET]: Use SLAB_PANIC
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/inetpeer.c | 5 | ||||
-rw-r--r-- | net/ipv4/ipmr.c | 5 | ||||
-rw-r--r-- | net/ipv4/route.c | 10 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 4 |
4 files changed, 6 insertions, 18 deletions
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index 03ff62ebcfeb..a675602ef295 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c | |||
@@ -126,12 +126,9 @@ void __init inet_initpeers(void) | |||
126 | 126 | ||
127 | peer_cachep = kmem_cache_create("inet_peer_cache", | 127 | peer_cachep = kmem_cache_create("inet_peer_cache", |
128 | sizeof(struct inet_peer), | 128 | sizeof(struct inet_peer), |
129 | 0, SLAB_HWCACHE_ALIGN, | 129 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
130 | NULL, NULL); | 130 | NULL, NULL); |
131 | 131 | ||
132 | if (!peer_cachep) | ||
133 | panic("cannot create inet_peer_cache"); | ||
134 | |||
135 | /* All the timers, started at system startup tend | 132 | /* All the timers, started at system startup tend |
136 | to synchronize. Perturb it a bit. | 133 | to synchronize. Perturb it a bit. |
137 | */ | 134 | */ |
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 98f0aa0d4216..ba49588da242 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1900,11 +1900,8 @@ void __init ip_mr_init(void) | |||
1900 | { | 1900 | { |
1901 | mrt_cachep = kmem_cache_create("ip_mrt_cache", | 1901 | mrt_cachep = kmem_cache_create("ip_mrt_cache", |
1902 | sizeof(struct mfc_cache), | 1902 | sizeof(struct mfc_cache), |
1903 | 0, SLAB_HWCACHE_ALIGN, | 1903 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
1904 | NULL, NULL); | 1904 | NULL, NULL); |
1905 | if (!mrt_cachep) | ||
1906 | panic("cannot allocate ip_mrt_cache"); | ||
1907 | |||
1908 | init_timer(&ipmr_expire_timer); | 1905 | init_timer(&ipmr_expire_timer); |
1909 | ipmr_expire_timer.function=ipmr_expire_process; | 1906 | ipmr_expire_timer.function=ipmr_expire_process; |
1910 | register_netdevice_notifier(&ip_mr_notifier); | 1907 | register_netdevice_notifier(&ip_mr_notifier); |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index a4d4cb85a16c..20ffe8e88c0f 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -3147,13 +3147,9 @@ int __init ip_rt_init(void) | |||
3147 | } | 3147 | } |
3148 | #endif | 3148 | #endif |
3149 | 3149 | ||
3150 | ipv4_dst_ops.kmem_cachep = kmem_cache_create("ip_dst_cache", | 3150 | ipv4_dst_ops.kmem_cachep = |
3151 | sizeof(struct rtable), | 3151 | kmem_cache_create("ip_dst_cache", sizeof(struct rtable), 0, |
3152 | 0, SLAB_HWCACHE_ALIGN, | 3152 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); |
3153 | NULL, NULL); | ||
3154 | |||
3155 | if (!ipv4_dst_ops.kmem_cachep) | ||
3156 | panic("IP: failed to allocate ip_dst_cache\n"); | ||
3157 | 3153 | ||
3158 | rt_hash_table = (struct rt_hash_bucket *) | 3154 | rt_hash_table = (struct rt_hash_bucket *) |
3159 | alloc_large_system_hash("IP route cache", | 3155 | alloc_large_system_hash("IP route cache", |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e570db4d33c8..29e3d606db78 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -2254,9 +2254,7 @@ void __init tcp_init(void) | |||
2254 | tcp_hashinfo.bind_bucket_cachep = | 2254 | tcp_hashinfo.bind_bucket_cachep = |
2255 | kmem_cache_create("tcp_bind_bucket", | 2255 | kmem_cache_create("tcp_bind_bucket", |
2256 | sizeof(struct inet_bind_bucket), 0, | 2256 | sizeof(struct inet_bind_bucket), 0, |
2257 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 2257 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); |
2258 | if (!tcp_hashinfo.bind_bucket_cachep) | ||
2259 | panic("tcp_init: Cannot alloc tcp_bind_bucket cache."); | ||
2260 | 2258 | ||
2261 | /* Size and allocate the main established and bind bucket | 2259 | /* Size and allocate the main established and bind bucket |
2262 | * hash tables. | 2260 | * hash tables. |