diff options
author | Christoph Hellwig <hch@lst.de> | 2018-04-10 13:42:55 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2018-05-16 01:24:30 -0400 |
commit | c3506372277779fccbffee2475400fcd689d5738 (patch) | |
tree | d45d820f96a84a1223fa84c6ad4b7d84a81399aa /net/phonet/pn_dev.c | |
parent | a2dcdee3748b664bf011b4b12de64e945dd4c8c2 (diff) |
proc: introduce proc_create_net{,_data}
Variants of proc_create{,_data} that directly take a struct seq_operations
and deal with network namespaces in ->open and ->release. All callers of
proc_create + seq_open_net converted over, and seq_{open,release}_net are
removed entirely.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'net/phonet/pn_dev.c')
-rw-r--r-- | net/phonet/pn_dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c index 77787512fc32..6cb4f602ab71 100644 --- a/net/phonet/pn_dev.c +++ b/net/phonet/pn_dev.c | |||
@@ -320,7 +320,8 @@ static int __net_init phonet_init_net(struct net *net) | |||
320 | { | 320 | { |
321 | struct phonet_net *pnn = phonet_pernet(net); | 321 | struct phonet_net *pnn = phonet_pernet(net); |
322 | 322 | ||
323 | if (!proc_create("phonet", 0, net->proc_net, &pn_sock_seq_fops)) | 323 | if (!proc_create_net("phonet", 0, net->proc_net, &pn_sock_seq_ops, |
324 | sizeof(struct seq_net_private))) | ||
324 | return -ENOMEM; | 325 | return -ENOMEM; |
325 | 326 | ||
326 | INIT_LIST_HEAD(&pnn->pndevs.list); | 327 | INIT_LIST_HEAD(&pnn->pndevs.list); |
@@ -351,7 +352,8 @@ int __init phonet_device_init(void) | |||
351 | if (err) | 352 | if (err) |
352 | return err; | 353 | return err; |
353 | 354 | ||
354 | proc_create("pnresource", 0, init_net.proc_net, &pn_res_seq_fops); | 355 | proc_create_net("pnresource", 0, init_net.proc_net, &pn_res_seq_ops, |
356 | sizeof(struct seq_net_private)); | ||
355 | register_netdevice_notifier(&phonet_device_notifier); | 357 | register_netdevice_notifier(&phonet_device_notifier); |
356 | err = phonet_netlink_register(); | 358 | err = phonet_netlink_register(); |
357 | if (err) | 359 | if (err) |