evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xfs: simplify /proc teardown & error handling

Browse source 
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:
Eric Sandeen 2015-10-12 18:21:22 +11:00 • committed by Dave Chinner
parent ff6d6af235
commit 9e92054e8e
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
fs/xfs/xfs_stats.c
View file

@ -165,41 +165,29 @@ int
xfs_init_procfs(void) xfs_init_procfs(void)
{ {
if (!proc_mkdir("fs/xfs", NULL)) if (!proc_mkdir("fs/xfs", NULL))
goto out; return -ENOMEM;
if (!proc_symlink("fs/xfs/stat", NULL, if (!proc_symlink("fs/xfs/stat", NULL,
"/sys/fs/xfs/stats/stats")) "/sys/fs/xfs/stats/stats"))
goto out_remove_xfs_dir; goto out;
#ifdef CONFIG_XFS_QUOTA #ifdef CONFIG_XFS_QUOTA
if (!proc_create("fs/xfs/xqmstat", 0, NULL, if (!proc_create("fs/xfs/xqmstat", 0, NULL,
&xqmstat_proc_fops)) &xqmstat_proc_fops))
goto out_remove_stat_file; goto out;
if (!proc_create("fs/xfs/xqm", 0, NULL, if (!proc_create("fs/xfs/xqm", 0, NULL,
&xqm_proc_fops)) &xqm_proc_fops))
goto out_remove_xqmstat_file; goto out;
#endif #endif
return 0; return 0;
#ifdef CONFIG_XFS_QUOTA out:
out_remove_xqmstat_file: remove_proc_subtree("fs/xfs", NULL);
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:
return -ENOMEM; return -ENOMEM;
} }
void void
xfs_cleanup_procfs(void) xfs_cleanup_procfs(void)
{ {
#ifdef CONFIG_XFS_QUOTA remove_proc_subtree("fs/xfs", NULL);
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);
} }