Skip to content

Commit

Permalink
staging: dgrp: cleanup sparse warnings
Browse files Browse the repository at this point in the history
A cleanup patch to remove sparse warnings caused by my other patch
"procfs: Improve Scaling in proc" since now proc_fops is protected by the rcu.

Signed-off-by: Nathan Zimmer <nzimmer@sgi.com>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Nathan Zimmer authored and Greg Kroah-Hartman committed Mar 14, 2013
1 parent 2c0fb1c commit 433121c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/dgrp/dgrp_dpa_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void dgrp_register_dpa_hook(struct proc_dir_entry *de)
struct nd_struct *node = de->data;

de->proc_iops = &dpa_inode_ops;
de->proc_fops = &dpa_ops;
rcu_assign_pointer(de->proc_fops, &dpa_ops);

node->nd_dpa_de = de;
spin_lock_init(&node->nd_dpa_lock);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/dgrp/dgrp_mon_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void dgrp_register_mon_hook(struct proc_dir_entry *de)
struct nd_struct *node = de->data;

de->proc_iops = &mon_inode_ops;
de->proc_fops = &mon_ops;
rcu_assign_pointer(de->proc_fops, &mon_ops);
node->nd_mon_de = de;
sema_init(&node->nd_mon_semaphore, 1);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/dgrp/dgrp_net_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void dgrp_register_net_hook(struct proc_dir_entry *de)
struct nd_struct *node = de->data;

de->proc_iops = &net_inode_ops;
de->proc_fops = &net_ops;
rcu_assign_pointer(de->proc_fops, &net_ops);
node->nd_net_de = de;
sema_init(&node->nd_net_semaphore, 1);
node->nd_state = NS_CLOSED;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/dgrp/dgrp_ports_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void dgrp_register_ports_hook(struct proc_dir_entry *de)
struct nd_struct *node = de->data;

de->proc_iops = &ports_inode_ops;
de->proc_fops = &ports_ops;
rcu_assign_pointer(de->proc_fops, &ports_ops);
node->nd_ports_de = de;
}

Expand Down
6 changes: 4 additions & 2 deletions drivers/staging/dgrp/dgrp_specproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,11 @@ static void register_proc_table(struct dgrp_proc_entry *table,
if (!table->child) {
de->proc_iops = &proc_inode_ops;
if (table->proc_file_ops)
de->proc_fops = table->proc_file_ops;
rcu_assign_pointer(de->proc_fops,
table->proc_file_ops);
else
de->proc_fops = &dgrp_proc_file_ops;
rcu_assign_pointer(de->proc_fops,
&dgrp_proc_file_ops);
}
}
table->de = de;
Expand Down

0 comments on commit 433121c

Please sign in to comment.