diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:25 -0500 |
commit | e18b890bb0881bbab6f4f1a6cd20d9c60d66b003 (patch) | |
tree | 4828be07e1c24781c264b42c5a75bcd968223c3f /include/net | |
parent | 441e143e95f5aa1e04026cb0aa71c801ba53982f (diff) |
[PATCH] slab: remove kmem_cache_t
Replace all uses of kmem_cache_t with struct kmem_cache.
The patch was generated using the following script:
#!/bin/sh
#
# Replace one string by another in all the kernel sources.
#
set -e
for file in `find * -name "*.c" -o -name "*.h"|xargs grep -l $1`; do
quilt add $file
sed -e "1,\$s/$1/$2/g" $file >/tmp/$$
mv /tmp/$$ $file
quilt refresh
done
The script was run like this
sh replace kmem_cache_t "struct kmem_cache"
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/dst.h | 2 | ||||
-rw-r--r-- | include/net/inet_hashtables.h | 6 | ||||
-rw-r--r-- | include/net/neighbour.h | 2 | ||||
-rw-r--r-- | include/net/netfilter/nf_conntrack_expect.h | 2 | ||||
-rw-r--r-- | include/net/request_sock.h | 2 | ||||
-rw-r--r-- | include/net/sock.h | 2 | ||||
-rw-r--r-- | include/net/timewait_sock.h | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index e156e38e4ac3..62b7e7598e9a 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
@@ -98,7 +98,7 @@ struct dst_ops | |||
98 | int entry_size; | 98 | int entry_size; |
99 | 99 | ||
100 | atomic_t entries; | 100 | atomic_t entries; |
101 | kmem_cache_t *kmem_cachep; | 101 | struct kmem_cache *kmem_cachep; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | #ifdef __KERNEL__ | 104 | #ifdef __KERNEL__ |
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index a9eb2eaf094e..34cc76e3ddb4 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h | |||
@@ -125,7 +125,7 @@ struct inet_hashinfo { | |||
125 | rwlock_t lhash_lock ____cacheline_aligned; | 125 | rwlock_t lhash_lock ____cacheline_aligned; |
126 | atomic_t lhash_users; | 126 | atomic_t lhash_users; |
127 | wait_queue_head_t lhash_wait; | 127 | wait_queue_head_t lhash_wait; |
128 | kmem_cache_t *bind_bucket_cachep; | 128 | struct kmem_cache *bind_bucket_cachep; |
129 | }; | 129 | }; |
130 | 130 | ||
131 | static inline struct inet_ehash_bucket *inet_ehash_bucket( | 131 | static inline struct inet_ehash_bucket *inet_ehash_bucket( |
@@ -136,10 +136,10 @@ static inline struct inet_ehash_bucket *inet_ehash_bucket( | |||
136 | } | 136 | } |
137 | 137 | ||
138 | extern struct inet_bind_bucket * | 138 | extern struct inet_bind_bucket * |
139 | inet_bind_bucket_create(kmem_cache_t *cachep, | 139 | inet_bind_bucket_create(struct kmem_cache *cachep, |
140 | struct inet_bind_hashbucket *head, | 140 | struct inet_bind_hashbucket *head, |
141 | const unsigned short snum); | 141 | const unsigned short snum); |
142 | extern void inet_bind_bucket_destroy(kmem_cache_t *cachep, | 142 | extern void inet_bind_bucket_destroy(struct kmem_cache *cachep, |
143 | struct inet_bind_bucket *tb); | 143 | struct inet_bind_bucket *tb); |
144 | 144 | ||
145 | static inline int inet_bhashfn(const __u16 lport, const int bhash_size) | 145 | static inline int inet_bhashfn(const __u16 lport, const int bhash_size) |
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index c8aacbd2e333..23967031ddb7 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -160,7 +160,7 @@ struct neigh_table | |||
160 | atomic_t entries; | 160 | atomic_t entries; |
161 | rwlock_t lock; | 161 | rwlock_t lock; |
162 | unsigned long last_rand; | 162 | unsigned long last_rand; |
163 | kmem_cache_t *kmem_cachep; | 163 | struct kmem_cache *kmem_cachep; |
164 | struct neigh_statistics *stats; | 164 | struct neigh_statistics *stats; |
165 | struct neighbour **hash_buckets; | 165 | struct neighbour **hash_buckets; |
166 | unsigned int hash_mask; | 166 | unsigned int hash_mask; |
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h index cef3136e22a3..41bcc9eb4206 100644 --- a/include/net/netfilter/nf_conntrack_expect.h +++ b/include/net/netfilter/nf_conntrack_expect.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <net/netfilter/nf_conntrack.h> | 7 | #include <net/netfilter/nf_conntrack.h> |
8 | 8 | ||
9 | extern struct list_head nf_conntrack_expect_list; | 9 | extern struct list_head nf_conntrack_expect_list; |
10 | extern kmem_cache_t *nf_conntrack_expect_cachep; | 10 | extern struct kmem_cache *nf_conntrack_expect_cachep; |
11 | extern struct file_operations exp_file_ops; | 11 | extern struct file_operations exp_file_ops; |
12 | 12 | ||
13 | struct nf_conntrack_expect | 13 | struct nf_conntrack_expect |
diff --git a/include/net/request_sock.h b/include/net/request_sock.h index 426f0fe774ef..7aed02ce2b65 100644 --- a/include/net/request_sock.h +++ b/include/net/request_sock.h | |||
@@ -29,7 +29,7 @@ struct proto; | |||
29 | struct request_sock_ops { | 29 | struct request_sock_ops { |
30 | int family; | 30 | int family; |
31 | int obj_size; | 31 | int obj_size; |
32 | kmem_cache_t *slab; | 32 | struct kmem_cache *slab; |
33 | int (*rtx_syn_ack)(struct sock *sk, | 33 | int (*rtx_syn_ack)(struct sock *sk, |
34 | struct request_sock *req, | 34 | struct request_sock *req, |
35 | struct dst_entry *dst); | 35 | struct dst_entry *dst); |
diff --git a/include/net/sock.h b/include/net/sock.h index fe3a33fad03f..730899ce5162 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -571,7 +571,7 @@ struct proto { | |||
571 | int *sysctl_rmem; | 571 | int *sysctl_rmem; |
572 | int max_header; | 572 | int max_header; |
573 | 573 | ||
574 | kmem_cache_t *slab; | 574 | struct kmem_cache *slab; |
575 | unsigned int obj_size; | 575 | unsigned int obj_size; |
576 | 576 | ||
577 | atomic_t *orphan_count; | 577 | atomic_t *orphan_count; |
diff --git a/include/net/timewait_sock.h b/include/net/timewait_sock.h index d7a306ea560d..1e1ee3253fd8 100644 --- a/include/net/timewait_sock.h +++ b/include/net/timewait_sock.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <net/sock.h> | 15 | #include <net/sock.h> |
16 | 16 | ||
17 | struct timewait_sock_ops { | 17 | struct timewait_sock_ops { |
18 | kmem_cache_t *twsk_slab; | 18 | struct kmem_cache *twsk_slab; |
19 | unsigned int twsk_obj_size; | 19 | unsigned int twsk_obj_size; |
20 | int (*twsk_unique)(struct sock *sk, | 20 | int (*twsk_unique)(struct sock *sk, |
21 | struct sock *sktw, void *twp); | 21 | struct sock *sktw, void *twp); |