Commit 2ce8f047 authored by Wang Chen's avatar Wang Chen Committed by David S. Miller
Browse files

[SUNRPC]: Use proc_create() to setup ->proc_fops first 



Use proc_create() to make sure that ->proc_fops be setup before gluing
PDE to main tree.

Signed-off-by: default avatarWang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64758bd7

net/sunrpc/cache.c

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

	cd->proc_ent->owner = cd->owner;

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

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





	p = create_proc_entry("flush", S_IFREG|S_IRUSR|S_IWUSR, cd->proc_ent);

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

			cd->proc_ent, &cache_flush_operations);

	cd->flush_ent = p;

	cd->flush_ent = p;

	if (p == NULL)

	if (p == NULL)

		goto out_nomem;

		goto out_nomem;

	p->proc_fops = &cache_flush_operations;

	p->owner = cd->owner;

	p->owner = cd->owner;

	p->data = cd;

	p->data = cd;





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

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

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

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

				      cd->proc_ent);

				cd->proc_ent, &cache_file_operations);

		cd->channel_ent = p;

		cd->channel_ent = p;

		if (p == NULL)

		if (p == NULL)

			goto out_nomem;

			goto out_nomem;

		p->proc_fops = &cache_file_operations;

		p->owner = cd->owner;

		p->owner = cd->owner;

		p->data = cd;

		p->data = cd;

	}

	}

	if (cd->cache_show) {

	if (cd->cache_show) {

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

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

				      cd->proc_ent);

				cd->proc_ent, &content_file_operations);

		cd->content_ent = p;

		cd->content_ent = p;

		if (p == NULL)

		if (p == NULL)

			goto out_nomem;

			goto out_nomem;

		p->proc_fops = &content_file_operations;

		p->owner = cd->owner;

		p->owner = cd->owner;

		p->data = cd;

		p->data = cd;

	}

	}

net/sunrpc/stats.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -229,9 +229,8 @@ do_register(const char *name, void *data, const struct file_operations *fops) 
	rpc_proc_init();

	rpc_proc_init();

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

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





	ent = create_proc_entry(name, 0, proc_net_rpc);

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

	if (ent) {

	if (ent) {

		ent->proc_fops = fops;

		ent->data = data;

		ent->data = data;

	}

	}

	return ent;

	return ent;