Re: [PATCH v2] sctp: use proc_remove_subtree()

[David Miller]

From: Al Viro 
Date: Fri, 16 Mar 2018 23:32:51 +

> use proc_remove_subtree() for subtree removal, both on setup failure
> halfway through and on teardown.  No need to make simple things
> complex...
> 
> Signed-off-by: Al Viro 

Applied, thanks Al.

Re: sctp: use proc_remove_subtree()

[Al Viro]

On Fri, Mar 16, 2018 at 12:44:15PM -0400, David Miller wrote:
> From: Al Viro 
> Date: Wed, 14 Mar 2018 20:51:19 +
> 
> > On Wed, Mar 14, 2018 at 08:46:21PM +, Al Viro wrote:
> >> use proc_remove_subtree() for subtree removal, both on setup failure
> >> halfway through and on teardown.  No need to make simple things
> >> complex...
> > 
> > ... and sctp_dbg_objcnt_exit() can be removed as well - 
> > remove_proc_subtree()
> > will get that sucker automatically.  Either a trivial addition, or equally
> > trivial followup...
> 
> Please add it to this patch and resubmit.

Done...

[PATCH v2] sctp: use proc_remove_subtree()

[Al Viro]

use proc_remove_subtree() for subtree removal, both on setup failure
halfway through and on teardown.  No need to make simple things
complex...

Signed-off-by: Al Viro 
---
 include/net/sctp/sctp.h | 11 +--
 net/sctp/objcnt.c   |  8 
 net/sctp/proc.c | 90 
+-
 net/sctp/protocol.c | 59 
++-
 4 files changed, 28 insertions(+), 140 deletions(-)

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index f7ae6b0a21d0..72c5b8fc3232 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -180,14 +180,7 @@ struct sctp_transport *sctp_epaddr_lookup_transport(
 /*
  * sctp/proc.c
  */
-int sctp_snmp_proc_init(struct net *net);
-void sctp_snmp_proc_exit(struct net *net);
-int sctp_eps_proc_init(struct net *net);
-void sctp_eps_proc_exit(struct net *net);
-int sctp_assocs_proc_init(struct net *net);
-void sctp_assocs_proc_exit(struct net *net);
-int sctp_remaddr_proc_init(struct net *net);
-void sctp_remaddr_proc_exit(struct net *net);
+int __net_init sctp_proc_init(struct net *net);
 
 /*
  * sctp/offload.c
@@ -318,7 +311,6 @@ atomic_t sctp_dbg_objcnt_## name = ATOMIC_INIT(0)
 {.label= #name, .counter= _dbg_objcnt_## name}
 
 void sctp_dbg_objcnt_init(struct net *);
-void sctp_dbg_objcnt_exit(struct net *);
 
 #else
 
@@ -326,7 +318,6 @@ void sctp_dbg_objcnt_exit(struct net *);
 #define SCTP_DBG_OBJCNT_DEC(name)
 
 static inline void sctp_dbg_objcnt_init(struct net *net) { return; }
-static inline void sctp_dbg_objcnt_exit(struct net *net) { return; }
 
 #endif /* CONFIG_SCTP_DBG_OBJCOUNT */
 
diff --git a/net/sctp/objcnt.c b/net/sctp/objcnt.c
index aeea6da81441..fd2684ad94c8 100644
--- a/net/sctp/objcnt.c
+++ b/net/sctp/objcnt.c
@@ -130,11 +130,3 @@ void sctp_dbg_objcnt_init(struct net *net)
if (!ent)
pr_warn("sctp_dbg_objcnt: Unable to create /proc entry.\n");
 }
-
-/* Cleanup the objcount entry in the proc filesystem.  */
-void sctp_dbg_objcnt_exit(struct net *net)
-{
-   remove_proc_entry("sctp_dbg_objcnt", net->sctp.proc_net_sctp);
-}
-
-
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index 537545ebcb0e..17d0155d9de3 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -101,25 +101,6 @@ static const struct file_operations sctp_snmp_seq_fops = {
.release = single_release_net,
 };
 
-/* Set up the proc fs entry for 'snmp' object. */
-int __net_init sctp_snmp_proc_init(struct net *net)
-{
-   struct proc_dir_entry *p;
-
-   p = proc_create("snmp", S_IRUGO, net->sctp.proc_net_sctp,
-   _snmp_seq_fops);
-   if (!p)
-   return -ENOMEM;
-
-   return 0;
-}
-
-/* Cleanup the proc fs entry for 'snmp' object. */
-void sctp_snmp_proc_exit(struct net *net)
-{
-   remove_proc_entry("snmp", net->sctp.proc_net_sctp);
-}
-
 /* Dump local addresses of an association/endpoint. */
 static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct 
sctp_ep_common *epb)
 {
@@ -259,25 +240,6 @@ static const struct file_operations sctp_eps_seq_fops = {
.release = seq_release_net,
 };
 
-/* Set up the proc fs entry for 'eps' object. */
-int __net_init sctp_eps_proc_init(struct net *net)
-{
-   struct proc_dir_entry *p;
-
-   p = proc_create("eps", S_IRUGO, net->sctp.proc_net_sctp,
-   _eps_seq_fops);
-   if (!p)
-   return -ENOMEM;
-
-   return 0;
-}
-
-/* Cleanup the proc fs entry for 'eps' object. */
-void sctp_eps_proc_exit(struct net *net)
-{
-   remove_proc_entry("eps", net->sctp.proc_net_sctp);
-}
-
 struct sctp_ht_iter {
struct seq_net_private p;
struct rhashtable_iter hti;
@@ -390,25 +352,6 @@ static const struct file_operations sctp_assocs_seq_fops = 
{
.release = seq_release_net,
 };
 
-/* Set up the proc fs entry for 'assocs' object. */
-int __net_init sctp_assocs_proc_init(struct net *net)
-{
-   struct proc_dir_entry *p;
-
-   p = proc_create("assocs", S_IRUGO, net->sctp.proc_net_sctp,
-   _assocs_seq_fops);
-   if (!p)
-   return -ENOMEM;
-
-   return 0;
-}
-
-/* Cleanup the proc fs entry for 'assocs' object. */
-void sctp_assocs_proc_exit(struct net *net)
-{
-   remove_proc_entry("assocs", net->sctp.proc_net_sctp);
-}
-
 static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
 {
struct sctp_association *assoc;
@@ -488,12 +431,6 @@ static const struct seq_operations sctp_remaddr_ops = {
.show  = sctp_remaddr_seq_show,
 };
 
-/* Cleanup the proc fs entry for 'remaddr' object. */
-void sctp_remaddr_proc_exit(struct net *net)
-{
-   remove_proc_entry("remaddr", net->sctp.proc_net_sctp);
-}
-
 static int sctp_remaddr_seq_open(struct inode *inode, struct file *file)
 {
return seq_open_net(inode, file, _remaddr_ops,
@@ -507,13 +444,28 @@ static 

Re: sctp: use proc_remove_subtree()

[David Miller]

From: Al Viro 
Date: Wed, 14 Mar 2018 20:51:19 +

> On Wed, Mar 14, 2018 at 08:46:21PM +, Al Viro wrote:
>> use proc_remove_subtree() for subtree removal, both on setup failure
>> halfway through and on teardown.  No need to make simple things
>> complex...
> 
> ... and sctp_dbg_objcnt_exit() can be removed as well - remove_proc_subtree()
> will get that sucker automatically.  Either a trivial addition, or equally
> trivial followup...

Please add it to this patch and resubmit.

Thanks Al.

Re: sctp: use proc_remove_subtree()

[Al Viro]

On Wed, Mar 14, 2018 at 08:46:21PM +, Al Viro wrote:
> use proc_remove_subtree() for subtree removal, both on setup failure
> halfway through and on teardown.  No need to make simple things
> complex...

... and sctp_dbg_objcnt_exit() can be removed as well - remove_proc_subtree()
will get that sucker automatically.  Either a trivial addition, or equally
trivial followup...

sctp: use proc_remove_subtree()

[Al Viro]

use proc_remove_subtree() for subtree removal, both on setup failure
halfway through and on teardown.  No need to make simple things
complex...

Signed-off-by: Al Viro 
---
 include/net/sctp/sctp.h |  9 +
 net/sctp/proc.c | 90 
+-
 net/sctp/protocol.c | 57 
++---
 3 files changed, 28 insertions(+), 128 deletions(-)

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index f7ae6b0a21d0..3f90134008e9 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -180,14 +180,7 @@ struct sctp_transport *sctp_epaddr_lookup_transport(
 /*
  * sctp/proc.c
  */
-int sctp_snmp_proc_init(struct net *net);
-void sctp_snmp_proc_exit(struct net *net);
-int sctp_eps_proc_init(struct net *net);
-void sctp_eps_proc_exit(struct net *net);
-int sctp_assocs_proc_init(struct net *net);
-void sctp_assocs_proc_exit(struct net *net);
-int sctp_remaddr_proc_init(struct net *net);
-void sctp_remaddr_proc_exit(struct net *net);
+int __net_init sctp_proc_init(struct net *net);
 
 /*
  * sctp/offload.c
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index 537545ebcb0e..17d0155d9de3 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -101,25 +101,6 @@ static const struct file_operations sctp_snmp_seq_fops = {
.release = single_release_net,
 };
 
-/* Set up the proc fs entry for 'snmp' object. */
-int __net_init sctp_snmp_proc_init(struct net *net)
-{
-   struct proc_dir_entry *p;
-
-   p = proc_create("snmp", S_IRUGO, net->sctp.proc_net_sctp,
-   _snmp_seq_fops);
-   if (!p)
-   return -ENOMEM;
-
-   return 0;
-}
-
-/* Cleanup the proc fs entry for 'snmp' object. */
-void sctp_snmp_proc_exit(struct net *net)
-{
-   remove_proc_entry("snmp", net->sctp.proc_net_sctp);
-}
-
 /* Dump local addresses of an association/endpoint. */
 static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct 
sctp_ep_common *epb)
 {
@@ -259,25 +240,6 @@ static const struct file_operations sctp_eps_seq_fops = {
.release = seq_release_net,
 };
 
-/* Set up the proc fs entry for 'eps' object. */
-int __net_init sctp_eps_proc_init(struct net *net)
-{
-   struct proc_dir_entry *p;
-
-   p = proc_create("eps", S_IRUGO, net->sctp.proc_net_sctp,
-   _eps_seq_fops);
-   if (!p)
-   return -ENOMEM;
-
-   return 0;
-}
-
-/* Cleanup the proc fs entry for 'eps' object. */
-void sctp_eps_proc_exit(struct net *net)
-{
-   remove_proc_entry("eps", net->sctp.proc_net_sctp);
-}
-
 struct sctp_ht_iter {
struct seq_net_private p;
struct rhashtable_iter hti;
@@ -390,25 +352,6 @@ static const struct file_operations sctp_assocs_seq_fops = 
{
.release = seq_release_net,
 };
 
-/* Set up the proc fs entry for 'assocs' object. */
-int __net_init sctp_assocs_proc_init(struct net *net)
-{
-   struct proc_dir_entry *p;
-
-   p = proc_create("assocs", S_IRUGO, net->sctp.proc_net_sctp,
-   _assocs_seq_fops);
-   if (!p)
-   return -ENOMEM;
-
-   return 0;
-}
-
-/* Cleanup the proc fs entry for 'assocs' object. */
-void sctp_assocs_proc_exit(struct net *net)
-{
-   remove_proc_entry("assocs", net->sctp.proc_net_sctp);
-}
-
 static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
 {
struct sctp_association *assoc;
@@ -488,12 +431,6 @@ static const struct seq_operations sctp_remaddr_ops = {
.show  = sctp_remaddr_seq_show,
 };
 
-/* Cleanup the proc fs entry for 'remaddr' object. */
-void sctp_remaddr_proc_exit(struct net *net)
-{
-   remove_proc_entry("remaddr", net->sctp.proc_net_sctp);
-}
-
 static int sctp_remaddr_seq_open(struct inode *inode, struct file *file)
 {
return seq_open_net(inode, file, _remaddr_ops,
@@ -507,13 +444,28 @@ static const struct file_operations sctp_remaddr_seq_fops 
= {
.release = seq_release_net,
 };
 
-int __net_init sctp_remaddr_proc_init(struct net *net)
+/* Set up the proc fs entry for the SCTP protocol. */
+int __net_init sctp_proc_init(struct net *net)
 {
-   struct proc_dir_entry *p;
-
-   p = proc_create("remaddr", S_IRUGO, net->sctp.proc_net_sctp,
-   _remaddr_seq_fops);
-   if (!p)
+   net->sctp.proc_net_sctp = proc_net_mkdir(net, "sctp", net->proc_net);
+   if (!net->sctp.proc_net_sctp)
return -ENOMEM;
+   if (!proc_create("snmp", S_IRUGO, net->sctp.proc_net_sctp,
+   _snmp_seq_fops))
+   goto cleanup;
+   if (!proc_create("eps", S_IRUGO, net->sctp.proc_net_sctp,
+   _eps_seq_fops))
+   goto cleanup;
+   if (!proc_create("assocs", S_IRUGO, net->sctp.proc_net_sctp,
+   _assocs_seq_fops))
+   goto cleanup;
+   if (!proc_create("remaddr",