diff options
| author | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
| commit | c646b0f4fdad4cc9dabdcbe40b5a893d173e2850 (patch) | |
| tree | 246e0d7bc48137f2d176ad126cebd275a60b6833 /fs/nfs/client.c | |
| parent | 4ce237b369eb9513c090d3c97e0c06c5a33f0cf7 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge tag 'v3.17' into toradex_vf_3.17-next
Linux 3.17
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
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); } /* |