lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Simply replace proc_create and further data assigned with proc_create_data.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev
2008-05-02 02:44:36 -07:00
committed by David S. Miller
parent fb65f180e0
commit e7fe23363b
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/sunrpc/cache.c
View File

@@ -316,31 +316,28 @@ 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 = proc_create("flush", S_IFREG|S_IRUSR|S_IWUSR, p = proc_create_data("flush", S_IFREG|S_IRUSR|S_IWUSR,
cd->proc_ent, &cache_flush_operations); cd->proc_ent, &cache_flush_operations, cd);
cd->flush_ent = p; cd->flush_ent = p;
if (p == NULL) if (p == NULL)
goto out_nomem; goto out_nomem;
p->owner = cd->owner; p->owner = cd->owner;
p->data = cd;
if (cd->cache_request || cd->cache_parse) { if (cd->cache_request || cd->cache_parse) {
p = proc_create("channel", S_IFREG|S_IRUSR|S_IWUSR, p = proc_create_data("channel", S_IFREG|S_IRUSR|S_IWUSR,
cd->proc_ent, &cache_file_operations); cd->proc_ent, &cache_file_operations, cd);
cd->channel_ent = p; cd->channel_ent = p;
if (p == NULL) if (p == NULL)
goto out_nomem; goto out_nomem;
p->owner = cd->owner; p->owner = cd->owner;
p->data = cd;
} }
if (cd->cache_show) { if (cd->cache_show) {
p = proc_create("content", S_IFREG|S_IRUSR|S_IWUSR, p = proc_create_data("content", S_IFREG|S_IRUSR|S_IWUSR,
cd->proc_ent, &content_file_operations); cd->proc_ent, &content_file_operations, cd);
cd->content_ent = p; cd->content_ent = p;
if (p == NULL) if (p == NULL)
goto out_nomem; goto out_nomem;
p->owner = cd->owner; p->owner = cd->owner;
p->data = cd;
} }
return 0; return 0;
out_nomem: out_nomem:

8
net/sunrpc/stats.c
View File

@@ -224,16 +224,10 @@ EXPORT_SYMBOL_GPL(rpc_print_iostats);
static inline struct proc_dir_entry * static inline struct proc_dir_entry *
do_register(const char *name, void *data, const struct file_operations *fops) do_register(const char *name, void *data, const struct file_operations *fops)
{ {
struct proc_dir_entry *ent;
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 = proc_create(name, 0, proc_net_rpc, fops); return proc_create_data(name, 0, proc_net_rpc, fops, data);
if (ent) {
ent->data = data;
}
return ent;
} }
struct proc_dir_entry * struct proc_dir_entry *