Commit 10495a00 authored by David Howells's avatar David Howells
Browse files

afs: Move /proc management functions to the end of the file 



In fs/afs/proc.c, move functions that create and remove /proc files to the
end of the source file as a first stage in getting rid of all the forward
declarations.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 96362fb4

fs/afs/proc.c

+79 −81
Original line number Diff line number Diff line
@@ -127,45 +127,6 @@ static const struct file_operations afs_proc_sysname_fops = { 
	.write		= afs_proc_sysname_write,

};



static int afs_proc_stats_show(struct seq_file *m, void *v);



/*

 * initialise the /proc/fs/afs/ directory

 */

int afs_proc_init(struct afs_net *net)

{

	_enter("");



	net->proc_afs = proc_mkdir("fs/afs", NULL);

	if (!net->proc_afs)

		goto error_dir;



	if (!proc_create("cells", 0644, net->proc_afs, &afs_proc_cells_fops) ||

	    !proc_create("rootcell", 0644, net->proc_afs, &afs_proc_rootcell_fops) ||

	    !proc_create_seq("servers", 0644, net->proc_afs, &afs_proc_servers_ops) ||

	    !proc_create_single("stats", 0644, net->proc_afs, afs_proc_stats_show) ||

	    !proc_create("sysname", 0644, net->proc_afs, &afs_proc_sysname_fops))

		goto error_tree;



	_leave(" = 0");

	return 0;



error_tree:

	proc_remove(net->proc_afs);

error_dir:

	_leave(" = -ENOMEM");

	return -ENOMEM;

}



/*

 * clean up the /proc/fs/afs/ directory

 */

void afs_proc_cleanup(struct afs_net *net)

{

	proc_remove(net->proc_afs);

	net->proc_afs = NULL;

}



/*

 * open "/proc/fs/afs/cells" which provides a summary of extant cells

 */
@@ -383,48 +344,6 @@ static ssize_t afs_proc_rootcell_write(struct file *file, 
	return ret;

}



/*

 * initialise /proc/fs/afs/<cell>/

 */

int afs_proc_cell_setup(struct afs_net *net, struct afs_cell *cell)

{

	struct proc_dir_entry *dir;



	_enter("%p{%s},%p", cell, cell->name, net->proc_afs);



	dir = proc_mkdir(cell->name, net->proc_afs);

	if (!dir)

		goto error_dir;



	if (!proc_create_seq_data("vlservers", 0, dir,

			&afs_proc_cell_vlservers_ops, cell))

		goto error_tree;

	if (!proc_create_seq_data("volumes", 0, dir, &afs_proc_cell_volumes_ops,

			cell))

		goto error_tree;



	_leave(" = 0");

	return 0;



error_tree:

	remove_proc_subtree(cell->name, net->proc_afs);

error_dir:

	_leave(" = -ENOMEM");

	return -ENOMEM;

}



/*

 * remove /proc/fs/afs/<cell>/

 */

void afs_proc_cell_remove(struct afs_net *net, struct afs_cell *cell)

{

	_enter("");



	remove_proc_subtree(cell->name, net->proc_afs);



	_leave("");

}



/*

 * set up the iterator to start reading from the cells list and return the

 * first item
@@ -842,3 +761,82 @@ static int afs_proc_stats_show(struct seq_file *m, void *v) 
		   atomic_long_read(&net->n_store_bytes));

	return 0;

}



/*

 * initialise /proc/fs/afs/<cell>/

 */

int afs_proc_cell_setup(struct afs_net *net, struct afs_cell *cell)

{

	struct proc_dir_entry *dir;



	_enter("%p{%s},%p", cell, cell->name, net->proc_afs);



	dir = proc_mkdir(cell->name, net->proc_afs);

	if (!dir)

		goto error_dir;



	if (!proc_create_seq_data("vlservers", 0, dir,

				  &afs_proc_cell_vlservers_ops, cell))

		goto error_tree;

	if (!proc_create_seq_data("volumes", 0, dir,

				  &afs_proc_cell_volumes_ops, cell))

		goto error_tree;



	_leave(" = 0");

	return 0;



error_tree:

	remove_proc_subtree(cell->name, net->proc_afs);

error_dir:

	_leave(" = -ENOMEM");

	return -ENOMEM;

}



/*

 * remove /proc/fs/afs/<cell>/

 */

void afs_proc_cell_remove(struct afs_net *net, struct afs_cell *cell)

{

	_enter("");



	remove_proc_subtree(cell->name, net->proc_afs);



	_leave("");

}



/*

 * initialise the /proc/fs/afs/ directory

 */

int afs_proc_init(struct afs_net *net)

{

	_enter("");



	net->proc_afs = proc_mkdir("fs/afs", NULL);

	if (!net->proc_afs)

		goto error_dir;



	if (!proc_create("cells", 0644, net->proc_afs, &afs_proc_cells_fops) ||

	    !proc_create("rootcell", 0644, net->proc_afs, &afs_proc_rootcell_fops) ||

	    !proc_create_seq("servers", 0644, net->proc_afs, &afs_proc_servers_ops) ||

	    !proc_create_single("stats", 0644, net->proc_afs, afs_proc_stats_show) ||

	    !proc_create("sysname", 0644, net->proc_afs, &afs_proc_sysname_fops))

		goto error_tree;



	_leave(" = 0");

	return 0;



error_tree:

	proc_remove(net->proc_afs);

error_dir:

	_leave(" = -ENOMEM");

	return -ENOMEM;

}



/*

 * clean up the /proc/fs/afs/ directory

 */

void afs_proc_cleanup(struct afs_net *net)

{

	proc_remove(net->proc_afs);

	net->proc_afs = NULL;

}