Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e92054e authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

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: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent ff6d6af2

fs/xfs/xfs_stats.c

+7 −19
Original line number Diff line number Diff line
@@ -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:

	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);

}