Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

SUNRPC: Remove more code when NFSD_DEPRECATED is not configured

Browse source 
Signed-off-by: NeilBrown <neilb@suse.de>
[bfields@redhat.com: moved svcauth_unix_purge outside ifdef's.]
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2011-01-04 13:31:45 -05:00 • committed by J. Bruce Fields
parent 31f7aa65f5
commit bdd5f05d91
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/linux/sunrpc/cache.h
View file

@ -255,10 +255,13 @@ static inline time_t get_expiry(char **bpp)
return rv - boot.tv_sec; return rv - boot.tv_sec;
} }
#ifdef CONFIG_NFSD_DEPRECATED
static inline void sunrpc_invalidate(struct cache_head *h, static inline void sunrpc_invalidate(struct cache_head *h,
struct cache_detail *detail) struct cache_detail *detail)
{ {
h->expiry_time = seconds_since_boot() - 1; h->expiry_time = seconds_since_boot() - 1;
detail->nextcheck = seconds_since_boot(); detail->nextcheck = seconds_since_boot();
} }
#endif /* CONFIG_NFSD_DEPRECATED */
#endif /* _LINUX_SUNRPC_CACHE_H_ */ #endif /* _LINUX_SUNRPC_CACHE_H_ */

12
net/sunrpc/svcauth_unix.c
View file

@ -30,7 +30,9 @@
struct unix_domain { struct unix_domain {
struct auth_domain h; struct auth_domain h;
#ifdef CONFIG_NFSD_DEPRECATED
int addr_changes; int addr_changes;
#endif /* CONFIG_NFSD_DEPRECATED */
/* other stuff later */ /* other stuff later */
}; };
@ -64,7 +66,9 @@ struct auth_domain *unix_domain_find(char *name)
return NULL; return NULL;
} }
new->h.flavour = &svcauth_unix; new->h.flavour = &svcauth_unix;
#ifdef CONFIG_NFSD_DEPRECATED
new->addr_changes = 0; new->addr_changes = 0;
#endif /* CONFIG_NFSD_DEPRECATED */
rv = auth_domain_lookup(name, &new->h); rv = auth_domain_lookup(name, &new->h);
} }
} }
@ -91,7 +95,9 @@ struct ip_map {
char m_class[8]; /* e.g. "nfsd" */ char m_class[8]; /* e.g. "nfsd" */
struct in6_addr m_addr; struct in6_addr m_addr;
struct unix_domain *m_client; struct unix_domain *m_client;
#ifdef CONFIG_NFSD_DEPRECATED
int m_add_change; int m_add_change;
#endif /* CONFIG_NFSD_DEPRECATED */
}; };
static void ip_map_put(struct kref *kref) static void ip_map_put(struct kref *kref)
@ -145,7 +151,9 @@ static void update(struct cache_head *cnew, struct cache_head *citem)
kref_get(&item->m_client->h.ref); kref_get(&item->m_client->h.ref);
new->m_client = item->m_client; new->m_client = item->m_client;
#ifdef CONFIG_NFSD_DEPRECATED
new->m_add_change = item->m_add_change; new->m_add_change = item->m_add_change;
#endif /* CONFIG_NFSD_DEPRECATED */
} }
static struct cache_head *ip_map_alloc(void) static struct cache_head *ip_map_alloc(void)
{ {
@ -330,6 +338,7 @@ static int __ip_map_update(struct cache_detail *cd, struct ip_map *ipm,
ip.h.flags = 0; ip.h.flags = 0;
if (!udom) if (!udom)
set_bit(CACHE_NEGATIVE, &ip.h.flags); set_bit(CACHE_NEGATIVE, &ip.h.flags);
#ifdef CONFIG_NFSD_DEPRECATED
else { else {
ip.m_add_change = udom->addr_changes; ip.m_add_change = udom->addr_changes;
/* if this is from the legacy set_client system call, /* if this is from the legacy set_client system call,
@ -338,6 +347,7 @@ static int __ip_map_update(struct cache_detail *cd, struct ip_map *ipm,
if (expiry == NEVER) if (expiry == NEVER)
ip.m_add_change++; ip.m_add_change++;
} }
#endif /* CONFIG_NFSD_DEPRECATED */
ip.h.expiry_time = expiry; ip.h.expiry_time = expiry;
ch = sunrpc_cache_update(cd, &ip.h, &ipm->h, ch = sunrpc_cache_update(cd, &ip.h, &ipm->h,
hash_str(ipm->m_class, IP_HASHBITS) ^ hash_str(ipm->m_class, IP_HASHBITS) ^
@ -357,6 +367,7 @@ static inline int ip_map_update(struct net *net, struct ip_map *ipm,
return __ip_map_update(sn->ip_map_cache, ipm, udom, expiry); return __ip_map_update(sn->ip_map_cache, ipm, udom, expiry);
} }
#ifdef CONFIG_NFSD_DEPRECATED
int auth_unix_add_addr(struct net *net, struct in6_addr *addr, struct auth_domain *dom) int auth_unix_add_addr(struct net *net, struct in6_addr *addr, struct auth_domain *dom)
{ {
struct unix_domain *udom; struct unix_domain *udom;
@ -411,6 +422,7 @@ struct auth_domain *auth_unix_lookup(struct net *net, struct in6_addr *addr)
return rv; return rv;
} }
EXPORT_SYMBOL_GPL(auth_unix_lookup); EXPORT_SYMBOL_GPL(auth_unix_lookup);
#endif /* CONFIG_NFSD_DEPRECATED */
void svcauth_unix_purge(void) void svcauth_unix_purge(void)
{ {