Commit e7fe2336 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

sunrpc: assign PDE->data before gluing PDE into /proc tree 



Simply replace proc_create and further data assigned with proc_create_data.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb65f180

net/sunrpc/cache.c

+6 −9
Original line number Diff line number Diff line
@@ -316,31 +316,28 @@ static int create_cache_proc_entries(struct cache_detail *cd) 
	cd->proc_ent->owner = cd->owner;

	cd->channel_ent = cd->content_ent = NULL;



	p = proc_create("flush", S_IFREG|S_IRUSR|S_IWUSR,

			cd->proc_ent, &cache_flush_operations);

	p = proc_create_data("flush", S_IFREG|S_IRUSR|S_IWUSR,

			     cd->proc_ent, &cache_flush_operations, cd);

	cd->flush_ent = p;

	if (p == NULL)

		goto out_nomem;

	p->owner = cd->owner;

	p->data = cd;



	if (cd->cache_request || cd->cache_parse) {

		p = proc_create("channel", S_IFREG|S_IRUSR|S_IWUSR,

				cd->proc_ent, &cache_file_operations);

		p = proc_create_data("channel", S_IFREG|S_IRUSR|S_IWUSR,

				     cd->proc_ent, &cache_file_operations, cd);

		cd->channel_ent = p;

		if (p == NULL)

			goto out_nomem;

		p->owner = cd->owner;

		p->data = cd;

	}

	if (cd->cache_show) {

		p = proc_create("content", S_IFREG|S_IRUSR|S_IWUSR,

				cd->proc_ent, &content_file_operations);

		p = proc_create_data("content", S_IFREG|S_IRUSR|S_IWUSR,

				cd->proc_ent, &content_file_operations, cd);

		cd->content_ent = p;

		if (p == NULL)

			goto out_nomem;

		p->owner = cd->owner;

		p->data = cd;

	}

	return 0;

out_nomem:

net/sunrpc/stats.c

+1 −7
Original line number Diff line number Diff line
@@ -224,16 +224,10 @@ EXPORT_SYMBOL_GPL(rpc_print_iostats); 
static inline struct proc_dir_entry *

do_register(const char *name, void *data, const struct file_operations *fops)

{

	struct proc_dir_entry *ent;



	rpc_proc_init();

	dprintk("RPC:       registering /proc/net/rpc/%s\n", name);



	ent = proc_create(name, 0, proc_net_rpc, fops);

	if (ent) {

		ent->data = data;

	}

	return ent;

	return proc_create_data(name, 0, proc_net_rpc, fops, data);

}



struct proc_dir_entry *