From: Brian Foster <bfoster@redhat.com>
To: Eric Sandeen <sandeen@redhat.com>
Cc: xfs-oss <xfs@oss.sgi.com>
Subject: Re: [PATCH] xfs: simplify /proc teardown & error handling
Date: Wed, 9 Sep 2015 07:49:16 -0400 [thread overview]
Message-ID: <20150909114915.GB30015@bfoster.bfoster> (raw)
In-Reply-To: <55EF3BAE.5010904@redhat.com>
On Tue, Sep 08, 2015 at 02:49:02PM -0500, Eric Sandeen wrote:
> remove_proc_subtree() was added in 3.9, and can be
> used to simplify our procfile creation error handling
> and cleanup, removing the nested gotos. It simply
> removes fs/xfs and everything created under it.
>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
>
> This goes after Bill's patches, I just noticed it
> while reviewing them.
>
> diff --git a/fs/xfs/xfs_stats.c b/fs/xfs/xfs_stats.c
> index 05d5227..009a860 100644
> --- a/fs/xfs/xfs_stats.c
> +++ b/fs/xfs/xfs_stats.c
> @@ -168,41 +168,29 @@ int
> xfs_init_procfs(void)
> {
> if (!proc_mkdir("fs/xfs", NULL))
> - goto out;
> + return -ENOMEM;
>
> if (!proc_symlink("fs/xfs/stat", NULL,
> "/sys/fs/xfs/stats/stats"))
> - goto out_remove_xfs_dir;
> + goto out;
>
> #ifdef CONFIG_XFS_QUOTA
> if (!proc_create("fs/xfs/xqmstat", 0, NULL,
> &xqmstat_proc_fops))
> - goto out_remove_stat_file;
> + goto out;
> if (!proc_create("fs/xfs/xqm", 0, NULL,
> &xqm_proc_fops))
> - goto out_remove_xqmstat_file;
> + goto out;
> #endif
> return 0;
>
> -#ifdef CONFIG_XFS_QUOTA
> - out_remove_xqmstat_file:
> - remove_proc_entry("fs/xfs/xqmstat", NULL);
> - out_remove_stat_file:
> - remove_proc_entry("fs/xfs/stat", NULL);
> -#endif
> - out_remove_xfs_dir:
> - remove_proc_entry("fs/xfs", NULL);
> - out:
> +out:
> + remove_proc_subtree("fs/xfs", NULL);
> return -ENOMEM;
> }
>
> void
> xfs_cleanup_procfs(void)
> {
> -#ifdef CONFIG_XFS_QUOTA
> - remove_proc_entry("fs/xfs/xqm", NULL);
> - remove_proc_entry("fs/xfs/xqmstat", NULL);
> -#endif
> - remove_proc_entry("fs/xfs/stat", NULL);
> - remove_proc_entry("fs/xfs", NULL);
> + remove_proc_subtree("fs/xfs", NULL);
> }
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2015-09-09 11:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-08 19:49 [PATCH] xfs: simplify /proc teardown & error handling Eric Sandeen
2015-09-09 11:49 ` Brian Foster [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150909114915.GB30015@bfoster.bfoster \
--to=bfoster@redhat.com \
--cc=sandeen@redhat.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox