diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-04-10 19:42:55 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-16 07:24:30 +0200 |
| commit | c3506372277779fccbffee2475400fcd689d5738 (patch) | |
| tree | d45d820f96a84a1223fa84c6ad4b7d84a81399aa /net/8021q | |
| parent | a2dcdee3748b664bf011b4b12de64e945dd4c8c2 (diff) | |
| download | linux-c3506372277779fccbffee2475400fcd689d5738.tar.gz linux-c3506372277779fccbffee2475400fcd689d5738.tar.bz2 linux-c3506372277779fccbffee2475400fcd689d5738.zip | |
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/8021q')
| -rw-r--r-- | net/8021q/vlanproc.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index d3e3f0f2ec1c..d36e8c4b7f56 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c @@ -73,19 +73,6 @@ static const struct seq_operations vlan_seq_ops = { .show = vlan_seq_show, }; -static int vlan_seq_open(struct inode *inode, struct file *file) -{ - return seq_open_net(inode, file, &vlan_seq_ops, - sizeof(struct seq_net_private)); -} - -static const struct file_operations vlan_fops = { - .open = vlan_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release_net, -}; - /* * Proc filesystem directory entries. */ @@ -132,8 +119,9 @@ int __net_init vlan_proc_init(struct net *net) if (!vn->proc_vlan_dir) goto err; - vn->proc_vlan_conf = proc_create(name_conf, S_IFREG | 0600, - vn->proc_vlan_dir, &vlan_fops); + vn->proc_vlan_conf = proc_create_net(name_conf, S_IFREG | 0600, + vn->proc_vlan_dir, &vlan_seq_ops, + sizeof(struct seq_net_private)); if (!vn->proc_vlan_conf) goto err; return 0; |