mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
xfs: simplify /proc teardown & error handling
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> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
parent
ff6d6af235
commit
9e92054e8e
1 changed files with 7 additions and 19 deletions
|
@ -165,41 +165,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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue