From 6337b2f2da9f513ad9475ee0acdcaccaa2d624a9 Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Fri, 25 Nov 2011 17:13:20 +0300 Subject: [PATCH] --- yaml --- r: 294383 b: refs/heads/master c: 39cb67b9a04300df41e201d9e6392691cdad080f h: refs/heads/master i: 294381: 2e5dac8fd57a89e3b8d02ade8903f4618fe98558 294379: 2bfa57d0f65526277528f970f36e20ba7da7f59e 294375: 9ffd3c9656d302080e9819a616383821621b7ff9 294367: 97a5ea973886f32e611959bb309e7a0a87f517f9 v: v3 --- [refs] | 2 +- trunk/fs/nfs/cache_lib.c | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index ead9cd0100a6..d2a67519ce49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9df69c81b469780b64f9b26bb87c048613fdeddf +refs/heads/master: 39cb67b9a04300df41e201d9e6392691cdad080f diff --git a/trunk/fs/nfs/cache_lib.c b/trunk/fs/nfs/cache_lib.c index 5905a31211e5..dded26368111 100644 --- a/trunk/fs/nfs/cache_lib.c +++ b/trunk/fs/nfs/cache_lib.c @@ -126,24 +126,14 @@ int nfs_cache_register_sb(struct super_block *sb, struct cache_detail *cd) int nfs_cache_register_net(struct net *net, struct cache_detail *cd) { - struct vfsmount *mnt; struct super_block *pipefs_sb; - int ret; + int ret = 0; - mnt = rpc_get_mount(); - if (IS_ERR(mnt)) - return PTR_ERR(mnt); pipefs_sb = rpc_get_sb_net(net); - if (!pipefs_sb) { - ret = -ENOENT; - goto err; + if (pipefs_sb) { + ret = nfs_cache_register_sb(pipefs_sb, cd); + rpc_put_sb_net(net); } - ret = nfs_cache_register_sb(pipefs_sb, cd); - rpc_put_sb_net(net); - if (!ret) - return ret; -err: - rpc_put_mount(); return ret; } @@ -162,7 +152,6 @@ void nfs_cache_unregister_net(struct net *net, struct cache_detail *cd) nfs_cache_unregister_sb(pipefs_sb, cd); rpc_put_sb_net(net); } - rpc_put_mount(); } void nfs_cache_init(struct cache_detail *cd)