diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /net/sunrpc/sunrpc_syms.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'net/sunrpc/sunrpc_syms.c')
-rw-r--r-- | net/sunrpc/sunrpc_syms.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c index 9f7373203592..769114f0f886 100644 --- a/net/sunrpc/sunrpc_syms.c +++ b/net/sunrpc/sunrpc_syms.c | |||
@@ -105,8 +105,6 @@ EXPORT_SYMBOL(auth_unix_lookup); | |||
105 | EXPORT_SYMBOL(cache_check); | 105 | EXPORT_SYMBOL(cache_check); |
106 | EXPORT_SYMBOL(cache_flush); | 106 | EXPORT_SYMBOL(cache_flush); |
107 | EXPORT_SYMBOL(cache_purge); | 107 | EXPORT_SYMBOL(cache_purge); |
108 | EXPORT_SYMBOL(cache_fresh); | ||
109 | EXPORT_SYMBOL(cache_init); | ||
110 | EXPORT_SYMBOL(cache_register); | 108 | EXPORT_SYMBOL(cache_register); |
111 | EXPORT_SYMBOL(cache_unregister); | 109 | EXPORT_SYMBOL(cache_unregister); |
112 | EXPORT_SYMBOL(qword_add); | 110 | EXPORT_SYMBOL(qword_add); |
@@ -142,6 +140,7 @@ EXPORT_SYMBOL(nlm_debug); | |||
142 | 140 | ||
143 | extern int register_rpc_pipefs(void); | 141 | extern int register_rpc_pipefs(void); |
144 | extern void unregister_rpc_pipefs(void); | 142 | extern void unregister_rpc_pipefs(void); |
143 | extern struct cache_detail ip_map_cache; | ||
145 | 144 | ||
146 | static int __init | 145 | static int __init |
147 | init_sunrpc(void) | 146 | init_sunrpc(void) |
@@ -158,7 +157,6 @@ init_sunrpc(void) | |||
158 | #ifdef CONFIG_PROC_FS | 157 | #ifdef CONFIG_PROC_FS |
159 | rpc_proc_init(); | 158 | rpc_proc_init(); |
160 | #endif | 159 | #endif |
161 | cache_register(&auth_domain_cache); | ||
162 | cache_register(&ip_map_cache); | 160 | cache_register(&ip_map_cache); |
163 | out: | 161 | out: |
164 | return err; | 162 | return err; |
@@ -169,8 +167,6 @@ cleanup_sunrpc(void) | |||
169 | { | 167 | { |
170 | unregister_rpc_pipefs(); | 168 | unregister_rpc_pipefs(); |
171 | rpc_destroy_mempool(); | 169 | rpc_destroy_mempool(); |
172 | if (cache_unregister(&auth_domain_cache)) | ||
173 | printk(KERN_ERR "sunrpc: failed to unregister auth_domain cache\n"); | ||
174 | if (cache_unregister(&ip_map_cache)) | 170 | if (cache_unregister(&ip_map_cache)) |
175 | printk(KERN_ERR "sunrpc: failed to unregister ip_map cache\n"); | 171 | printk(KERN_ERR "sunrpc: failed to unregister ip_map cache\n"); |
176 | #ifdef RPC_DEBUG | 172 | #ifdef RPC_DEBUG |