mptcp: Fix up build error for mptcp proc filesystem

proc_create_net_single() now provides a simpler way to add an entry to the proc filesystem, and the old single_open_net() and single_release_net() functions are no longer available. Signed-off-by: Mat Martineau <[email protected]>
multipath-tcp · Sep 14, 2018 · 4379ee6 · 4379ee6
1 parent dd64d1c
commit 4379ee6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 45 deletions.
diff --git a/net/mptcp/mptcp_ctrl.c b/net/mptcp/mptcp_ctrl.c
@@ -2879,19 +2879,6 @@ static int mptcp_pm_seq_show(struct seq_file *seq, void *v)
 	return 0;
 }
 
-static int mptcp_pm_seq_open(struct inode *inode, struct file *file)
-{
-	return single_open_net(inode, file, mptcp_pm_seq_show);
-}
-
-static const struct file_operations mptcp_pm_seq_fops = {
-	.owner = THIS_MODULE,
-	.open = mptcp_pm_seq_open,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.release = single_release_net,
-};
-
 static int mptcp_snmp_seq_show(struct seq_file *seq, void *v)
 {
 	struct net *net = seq->private;
@@ -2905,19 +2892,6 @@ static int mptcp_snmp_seq_show(struct seq_file *seq, void *v)
 	return 0;
 }
 
-static int mptcp_snmp_seq_open(struct inode *inode, struct file *file)
-{
-	return single_open_net(inode, file, mptcp_snmp_seq_show);
-}
-
-static const struct file_operations mptcp_snmp_seq_fops = {
-	.owner = THIS_MODULE,
-	.open = mptcp_snmp_seq_open,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.release = single_release_net,
-};
-
 static int mptcp_pm_init_net(struct net *net)
 {
 	net->mptcp.mptcp_statistics = alloc_percpu(struct mptcp_mib);
@@ -2928,11 +2902,11 @@ static int mptcp_pm_init_net(struct net *net)
 	net->mptcp.proc_net_mptcp = proc_net_mkdir(net, "mptcp_net", net->proc_net);
 	if (!net->mptcp.proc_net_mptcp)
 		goto out_proc_net_mptcp;
-	if (!proc_create("mptcp", S_IRUGO, net->mptcp.proc_net_mptcp,
-			 &mptcp_pm_seq_fops))
+	if (!proc_create_net_single("mptcp", S_IRUGO, net->mptcp.proc_net_mptcp,
+				    mptcp_pm_seq_show, NULL))
 		goto out_mptcp_net_mptcp;
-	if (!proc_create("snmp", S_IRUGO, net->mptcp.proc_net_mptcp,
-			 &mptcp_snmp_seq_fops))
+	if (!proc_create_net_single("snmp", S_IRUGO, net->mptcp.proc_net_mptcp,
+				    mptcp_snmp_seq_show, NULL))
 		goto out_mptcp_net_snmp;
 #endif
 

diff --git a/net/mptcp/mptcp_fullmesh.c b/net/mptcp/mptcp_fullmesh.c
@@ -1858,19 +1858,6 @@ static int mptcp_fm_seq_show(struct seq_file *seq, void *v)
 	return 0;
 }
 
-static int mptcp_fm_seq_open(struct inode *inode, struct file *file)
-{
-	return single_open_net(inode, file, mptcp_fm_seq_show);
-}
-
-static const struct file_operations mptcp_fm_seq_fops = {
-	.owner = THIS_MODULE,
-	.open = mptcp_fm_seq_open,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.release = single_release_net,
-};
-
 static int mptcp_fm_init_net(struct net *net)
 {
 	struct mptcp_loc_addr *mptcp_local;
@@ -1887,8 +1874,8 @@ static int mptcp_fm_init_net(struct net *net)
 		goto err_mptcp_local;
 	}
 
-	if (!proc_create("mptcp_fullmesh", S_IRUGO, net->proc_net,
-			 &mptcp_fm_seq_fops)) {
+	if (!proc_create_net_single("mptcp_fullmesh", S_IRUGO, net->proc_net,
+			 mptcp_fm_seq_show, NULL)) {
 		err = -ENOMEM;
 		goto err_seq_fops;
 	}