OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFS: simplify and clean cache library 

This is a cleanup patch.
Such helpers like nfs_cache_init() and nfs_cache_destroy() are redundant,
because they are just a wrappers around sunrpc_init_cache_detail() and
sunrpc_destroy_cache_detail() respectively.
So let's remove them completely and move corresponding logic to
nfs_cache_register_net() and nfs_cache_unregister_net() respectively (since
they are called together anyway).

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Stanislav Kinsbursky 2013-02-04 14:02:40 +03:00 committed by J. Bruce Fields
parent 483479c26a
commit 462b8f6bf1
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/nfs/cache_lib.c
View File

@ -128,10 +128,13 @@ int nfs_cache_register_net(struct net *net, struct cache_detail *cd)
struct super_block *pipefs_sb; struct super_block *pipefs_sb;
int ret = 0; int ret = 0;
sunrpc_init_cache_detail(cd);
pipefs_sb = rpc_get_sb_net(net); pipefs_sb = rpc_get_sb_net(net);
if (pipefs_sb) { if (pipefs_sb) {
ret = nfs_cache_register_sb(pipefs_sb, cd); ret = nfs_cache_register_sb(pipefs_sb, cd);
rpc_put_sb_net(net); rpc_put_sb_net(net);
if (ret)
sunrpc_destroy_cache_detail(cd);
} }
return ret; return ret;
} }
@ -151,14 +154,5 @@ void nfs_cache_unregister_net(struct net *net, struct cache_detail *cd)
nfs_cache_unregister_sb(pipefs_sb, cd); nfs_cache_unregister_sb(pipefs_sb, cd);
rpc_put_sb_net(net); rpc_put_sb_net(net);
} }
}
void nfs_cache_init(struct cache_detail *cd)
{
sunrpc_init_cache_detail(cd);
}
void nfs_cache_destroy(struct cache_detail *cd)
{
sunrpc_destroy_cache_detail(cd); sunrpc_destroy_cache_detail(cd);
} }

2
fs/nfs/cache_lib.h
View File

@ -23,8 +23,6 @@ extern struct nfs_cache_defer_req *nfs_cache_defer_req_alloc(void);
extern void nfs_cache_defer_req_put(struct nfs_cache_defer_req *dreq); extern void nfs_cache_defer_req_put(struct nfs_cache_defer_req *dreq);
extern int nfs_cache_wait_for_upcall(struct nfs_cache_defer_req *dreq); extern int nfs_cache_wait_for_upcall(struct nfs_cache_defer_req *dreq);
extern void nfs_cache_init(struct cache_detail *cd);
extern void nfs_cache_destroy(struct cache_detail *cd);
extern int nfs_cache_register_net(struct net *net, struct cache_detail *cd); extern int nfs_cache_register_net(struct net *net, struct cache_detail *cd);
extern void nfs_cache_unregister_net(struct net *net, struct cache_detail *cd); extern void nfs_cache_unregister_net(struct net *net, struct cache_detail *cd);
extern int nfs_cache_register_sb(struct super_block *sb, extern int nfs_cache_register_sb(struct super_block *sb,

6
fs/nfs/dns_resolve.c
View File

@ -377,14 +377,12 @@ int nfs_dns_resolver_cache_init(struct net *net)
if (IS_ERR(nn->nfs_dns_resolve)) if (IS_ERR(nn->nfs_dns_resolve))
return PTR_ERR(nn->nfs_dns_resolve); return PTR_ERR(nn->nfs_dns_resolve);
nfs_cache_init(nn->nfs_dns_resolve);
err = nfs_cache_register_net(net, nn->nfs_dns_resolve); err = nfs_cache_register_net(net, nn->nfs_dns_resolve);
if (err) if (err)
goto err_reg; goto err_reg;
return 0; return 0;
err_reg: err_reg:
nfs_cache_destroy(nn->nfs_dns_resolve);
cache_destroy_net(nn->nfs_dns_resolve, net); cache_destroy_net(nn->nfs_dns_resolve, net);
return err; return err;
} }
@ -392,10 +390,8 @@ err_reg:
void nfs_dns_resolver_cache_destroy(struct net *net) void nfs_dns_resolver_cache_destroy(struct net *net)
{ {
struct nfs_net *nn = net_generic(net, nfs_net_id); struct nfs_net *nn = net_generic(net, nfs_net_id);
struct cache_detail *cd = nn->nfs_dns_resolve;
nfs_cache_unregister_net(net, cd); nfs_cache_unregister_net(net, nn->nfs_dns_resolve);
nfs_cache_destroy(cd);
cache_destroy_net(nn->nfs_dns_resolve, net); cache_destroy_net(nn->nfs_dns_resolve, net);
} }