mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 22:25:03 +00:00
Code Issues Releases Wiki Activity

airo: correct proc entry creation interfaces

Browse source 
* use proc_mkdir_mode() instead of create_proc_entry(S_IFDIR|...),
  export proc_mkdir_mode() for that, oh well.
* don't supply S_IFREG to proc_create_data(), it's unnecessary

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Alexey Dobriyan 2011-05-14 00:12:48 +03:00 committed by John W. Linville
parent 9368a9a237
commit 011159a0a7
2 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/net/wireless/airo.c
View file

@ -4500,17 +4500,15 @@ static int setup_proc_entry( struct net_device *dev,
struct proc_dir_entry *entry; struct proc_dir_entry *entry;
/* First setup the device directory */ /* First setup the device directory */
strcpy(apriv->proc_name,dev->name); strcpy(apriv->proc_name,dev->name);
apriv->proc_entry = create_proc_entry(apriv->proc_name, apriv->proc_entry = proc_mkdir_mode(apriv->proc_name, airo_perm,
S_IFDIR|airo_perm, airo_entry);
airo_entry);
if (!apriv->proc_entry) if (!apriv->proc_entry)
goto fail; goto fail;
apriv->proc_entry->uid = proc_uid; apriv->proc_entry->uid = proc_uid;
apriv->proc_entry->gid = proc_gid; apriv->proc_entry->gid = proc_gid;
/* Setup the StatsDelta */ /* Setup the StatsDelta */
entry = proc_create_data("StatsDelta", entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm,
S_IFREG | (S_IRUGO&proc_perm),
apriv->proc_entry, &proc_statsdelta_ops, dev); apriv->proc_entry, &proc_statsdelta_ops, dev);
if (!entry) if (!entry)
goto fail_stats_delta; goto fail_stats_delta;
@ -4518,8 +4516,7 @@ static int setup_proc_entry( struct net_device *dev,
entry->gid = proc_gid; entry->gid = proc_gid;
/* Setup the Stats */ /* Setup the Stats */
entry = proc_create_data("Stats", entry = proc_create_data("Stats", S_IRUGO & proc_perm,
S_IFREG | (S_IRUGO&proc_perm),
apriv->proc_entry, &proc_stats_ops, dev); apriv->proc_entry, &proc_stats_ops, dev);
if (!entry) if (!entry)
goto fail_stats; goto fail_stats;
@ -4527,8 +4524,7 @@ static int setup_proc_entry( struct net_device *dev,
entry->gid = proc_gid; entry->gid = proc_gid;
/* Setup the Status */ /* Setup the Status */
entry = proc_create_data("Status", entry = proc_create_data("Status", S_IRUGO & proc_perm,
S_IFREG | (S_IRUGO&proc_perm),
apriv->proc_entry, &proc_status_ops, dev); apriv->proc_entry, &proc_status_ops, dev);
if (!entry) if (!entry)
goto fail_status; goto fail_status;
@ -4536,8 +4532,7 @@ static int setup_proc_entry( struct net_device *dev,
entry->gid = proc_gid; entry->gid = proc_gid;
/* Setup the Config */ /* Setup the Config */
entry = proc_create_data("Config", entry = proc_create_data("Config", proc_perm,
S_IFREG | proc_perm,
apriv->proc_entry, &proc_config_ops, dev); apriv->proc_entry, &proc_config_ops, dev);
if (!entry) if (!entry)
goto fail_config; goto fail_config;
@ -4545,8 +4540,7 @@ static int setup_proc_entry( struct net_device *dev,
entry->gid = proc_gid; entry->gid = proc_gid;
/* Setup the SSID */ /* Setup the SSID */
entry = proc_create_data("SSID", entry = proc_create_data("SSID", proc_perm,
S_IFREG | proc_perm,
apriv->proc_entry, &proc_SSID_ops, dev); apriv->proc_entry, &proc_SSID_ops, dev);
if (!entry) if (!entry)
goto fail_ssid; goto fail_ssid;
@ -4554,8 +4548,7 @@ static int setup_proc_entry( struct net_device *dev,
entry->gid = proc_gid; entry->gid = proc_gid;
/* Setup the APList */ /* Setup the APList */
entry = proc_create_data("APList", entry = proc_create_data("APList", proc_perm,
S_IFREG | proc_perm,
apriv->proc_entry, &proc_APList_ops, dev); apriv->proc_entry, &proc_APList_ops, dev);
if (!entry) if (!entry)
goto fail_aplist; goto fail_aplist;
@ -4563,8 +4556,7 @@ static int setup_proc_entry( struct net_device *dev,
entry->gid = proc_gid; entry->gid = proc_gid;
/* Setup the BSSList */ /* Setup the BSSList */
entry = proc_create_data("BSSList", entry = proc_create_data("BSSList", proc_perm,
S_IFREG | proc_perm,
apriv->proc_entry, &proc_BSSList_ops, dev); apriv->proc_entry, &proc_BSSList_ops, dev);
if (!entry) if (!entry)
goto fail_bsslist; goto fail_bsslist;
@ -4572,8 +4564,7 @@ static int setup_proc_entry( struct net_device *dev,
entry->gid = proc_gid; entry->gid = proc_gid;
/* Setup the WepKey */ /* Setup the WepKey */
entry = proc_create_data("WepKey", entry = proc_create_data("WepKey", proc_perm,
S_IFREG | proc_perm,
apriv->proc_entry, &proc_wepkey_ops, dev); apriv->proc_entry, &proc_wepkey_ops, dev);
if (!entry) if (!entry)
goto fail_wepkey; goto fail_wepkey;
@ -5705,9 +5696,7 @@ static int __init airo_init_module( void )
{ {
int i; int i;
airo_entry = create_proc_entry("driver/aironet", airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL);
S_IFDIR | airo_perm,
NULL);
if (airo_entry) { if (airo_entry) {
airo_entry->uid = proc_uid; airo_entry->uid = proc_uid;

1
fs/proc/generic.c
View file

@ -674,6 +674,7 @@ struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,
} }
return ent; return ent;
} }
EXPORT_SYMBOL(proc_mkdir_mode);
struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,
struct proc_dir_entry *parent) struct proc_dir_entry *parent)