diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-27 03:09:39 +0400 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-27 03:09:39 +0400 |
| commit | b6b2fe5b6e956c8217a7584472a3ac5c068b61d4 (patch) | |
| tree | 899d38684e674a05fc3e4ae2885529b916583323 /fs/nfs/client.c | |
| parent | b52f4914f3be3ff50e7308e3ce03a2ce71195ecc (diff) | |
| parent | b9e742c3164344fece3615aca42ec51b41753908 (diff) | |
| download | linux-b6b2fe5b6e956c8217a7584472a3ac5c068b61d4.tar.xz | |
Merge tag 'tegra-clk-3.18' of git://nv-tegra.nvidia.com/user/pdeschrijver/linux into clk-next
Tegra clk updates for 3.18
Diffstat (limited to 'fs/nfs/client.c')
| -rw-r--r-- | fs/nfs/client.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 1c5ff6d58385..6a4f3666e273 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -1412,24 +1412,18 @@ int nfs_fs_proc_net_init(struct net *net) p = proc_create("volumes", S_IFREG|S_IRUGO, nn->proc_nfsfs, &nfs_volume_list_fops); if (!p) - goto error_2; + goto error_1; return 0; -error_2: - remove_proc_entry("servers", nn->proc_nfsfs); error_1: - remove_proc_entry("fs/nfsfs", NULL); + remove_proc_subtree("nfsfs", net->proc_net); error_0: return -ENOMEM; } void nfs_fs_proc_net_exit(struct net *net) { - struct nfs_net *nn = net_generic(net, nfs_net_id); - - remove_proc_entry("volumes", nn->proc_nfsfs); - remove_proc_entry("servers", nn->proc_nfsfs); - remove_proc_entry("fs/nfsfs", NULL); + remove_proc_subtree("nfsfs", net->proc_net); } /* |