From 1d30c0846e0113c2a0d8c5f4340de7488c0cea1f Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Thu, 19 Jan 2012 21:42:53 +0400 Subject: [PATCH] --- yaml --- r: 294423 b: refs/heads/master c: 2c5f846747526e2b83c5f1b8e69016be0e2e87c0 h: refs/heads/master i: 294421: 3ea191cfb841216b4c04df093cc3ada3669f87bb 294419: 1325078ab56df508ee8b86b4957a14e3335d2368 294415: e3f9c6a466ca46f03ff08543247112b8136137c6 v: v3 --- [refs] | 2 +- trunk/include/linux/sunrpc/cache.h | 2 -- trunk/net/sunrpc/cache.c | 12 ------------ 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 821337b543d1..05cc6e8b54c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d05cc10406893dec65b8e89746e7d4c333935415 +refs/heads/master: 2c5f846747526e2b83c5f1b8e69016be0e2e87c0 diff --git a/trunk/include/linux/sunrpc/cache.h b/trunk/include/linux/sunrpc/cache.h index 259381ca811b..f5fd6160dbca 100644 --- a/trunk/include/linux/sunrpc/cache.h +++ b/trunk/include/linux/sunrpc/cache.h @@ -198,9 +198,7 @@ extern void cache_flush(void); extern void cache_purge(struct cache_detail *detail); #define NEVER (0x7FFFFFFF) extern void __init cache_initialize(void); -extern int cache_register(struct cache_detail *cd); extern int cache_register_net(struct cache_detail *cd, struct net *net); -extern void cache_unregister(struct cache_detail *cd); extern void cache_unregister_net(struct cache_detail *cd, struct net *net); extern struct cache_detail *cache_create_net(struct cache_detail *tmpl, struct net *net); diff --git a/trunk/net/sunrpc/cache.c b/trunk/net/sunrpc/cache.c index a450b8ac648b..f21ece088764 100644 --- a/trunk/net/sunrpc/cache.c +++ b/trunk/net/sunrpc/cache.c @@ -1645,12 +1645,6 @@ int cache_register_net(struct cache_detail *cd, struct net *net) } EXPORT_SYMBOL_GPL(cache_register_net); -int cache_register(struct cache_detail *cd) -{ - return cache_register_net(cd, &init_net); -} -EXPORT_SYMBOL_GPL(cache_register); - void cache_unregister_net(struct cache_detail *cd, struct net *net) { remove_cache_proc_entries(cd, net); @@ -1658,12 +1652,6 @@ void cache_unregister_net(struct cache_detail *cd, struct net *net) } EXPORT_SYMBOL_GPL(cache_unregister_net); -void cache_unregister(struct cache_detail *cd) -{ - cache_unregister_net(cd, &init_net); -} -EXPORT_SYMBOL_GPL(cache_unregister); - struct cache_detail *cache_create_net(struct cache_detail *tmpl, struct net *net) { struct cache_detail *cd;