Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294383
b: refs/heads/master
c: 39cb67b
h: refs/heads/master
i:
  294381: 2e5dac8
  294379: 2bfa57d
  294375: 9ffd3c9
  294367: 97a5ea9
v: v3
  • Loading branch information
Stanislav Kinsbursky authored and Trond Myklebust committed Jan 31, 2012
1 parent e84e6fa commit 6337b2f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9df69c81b469780b64f9b26bb87c048613fdeddf
refs/heads/master: 39cb67b9a04300df41e201d9e6392691cdad080f
19 changes: 4 additions & 15 deletions trunk/fs/nfs/cache_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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)
Expand Down

0 comments on commit 6337b2f

Please sign in to comment.