Skip to content

Commit 6d37a15

Browse files
Wang Chendavem330
authored andcommitted
[WANROUTER]: 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: Wang Chen <wangchen@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent d45fba3 commit 6d37a15

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

net/wanrouter/wanproc.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,12 @@ int __init wanrouter_proc_init(void)
292292
if (!proc_router)
293293
goto fail;
294294

295-
p = create_proc_entry("config", S_IRUGO, proc_router);
295+
p = proc_create("config", S_IRUGO, proc_router, &config_fops);
296296
if (!p)
297297
goto fail_config;
298-
p->proc_fops = &config_fops;
299-
p = create_proc_entry("status", S_IRUGO, proc_router);
298+
p = proc_create("status", S_IRUGO, proc_router, &status_fops);
300299
if (!p)
301300
goto fail_stat;
302-
p->proc_fops = &status_fops;
303301
return 0;
304302
fail_stat:
305303
remove_proc_entry("config", proc_router);
@@ -329,10 +327,10 @@ int wanrouter_proc_add(struct wan_device* wandev)
329327
if (wandev->magic != ROUTER_MAGIC)
330328
return -EINVAL;
331329

332-
wandev->dent = create_proc_entry(wandev->name, S_IRUGO, proc_router);
330+
wandev->dent = proc_create(wandev->name, S_IRUGO,
331+
proc_router, &wandev_fops);
333332
if (!wandev->dent)
334333
return -ENOMEM;
335-
wandev->dent->proc_fops = &wandev_fops;
336334
wandev->dent->data = wandev;
337335
return 0;
338336
}

0 commit comments

Comments
 (0)