diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2007-02-12 03:55:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:45 -0500 |
commit | d54b1fdb1d9f82e375a299e22bd366aad52d4c34 (patch) | |
tree | f94768d59702dbbc0beb9a70d9be65dbc5e5108d /drivers/net | |
parent | fa027c2a0a0d6d1df6b29ee99048502c93da0dd4 (diff) |
[PATCH] mark struct file_operations const 5
Many struct file_operations in the kernel can be "const". Marking them const
moves these to the .rodata section, which avoids false sharing with potential
dirty data. In addition it'll catch accidental writes at compile time to
these shared resources.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/bpqether.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/scc.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/yam.c | 2 | ||||
-rw-r--r-- | drivers/net/ibmveth.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/vlsi_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/ppp_generic.c | 2 | ||||
-rw-r--r-- | drivers/net/pppoe.c | 2 | ||||
-rw-r--r-- | drivers/net/tun.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/cosa.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/airo.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 12 | ||||
-rw-r--r-- | drivers/net/wireless/strip.c | 2 |
13 files changed, 25 insertions, 25 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 8ce8fec615ba..61a6fa465d71 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -3120,7 +3120,7 @@ static int bond_info_open(struct inode *inode, struct file *file) | |||
3120 | return res; | 3120 | return res; |
3121 | } | 3121 | } |
3122 | 3122 | ||
3123 | static struct file_operations bond_info_fops = { | 3123 | static const struct file_operations bond_info_fops = { |
3124 | .owner = THIS_MODULE, | 3124 | .owner = THIS_MODULE, |
3125 | .open = bond_info_open, | 3125 | .open = bond_info_open, |
3126 | .read = seq_read, | 3126 | .read = seq_read, |
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 5b788d84011f..d2542697e298 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
@@ -459,7 +459,7 @@ static int bpq_info_open(struct inode *inode, struct file *file) | |||
459 | return seq_open(file, &bpq_seqops); | 459 | return seq_open(file, &bpq_seqops); |
460 | } | 460 | } |
461 | 461 | ||
462 | static struct file_operations bpq_info_fops = { | 462 | static const struct file_operations bpq_info_fops = { |
463 | .owner = THIS_MODULE, | 463 | .owner = THIS_MODULE, |
464 | .open = bpq_info_open, | 464 | .open = bpq_info_open, |
465 | .read = seq_read, | 465 | .read = seq_read, |
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 2ce047e9d262..6fdaad5a4577 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
@@ -2083,7 +2083,7 @@ static int scc_net_seq_open(struct inode *inode, struct file *file) | |||
2083 | return seq_open(file, &scc_net_seq_ops); | 2083 | return seq_open(file, &scc_net_seq_ops); |
2084 | } | 2084 | } |
2085 | 2085 | ||
2086 | static struct file_operations scc_net_seq_fops = { | 2086 | static const struct file_operations scc_net_seq_fops = { |
2087 | .owner = THIS_MODULE, | 2087 | .owner = THIS_MODULE, |
2088 | .open = scc_net_seq_open, | 2088 | .open = scc_net_seq_open, |
2089 | .read = seq_read, | 2089 | .read = seq_read, |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 6d74f08720d5..08f27119a807 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -804,7 +804,7 @@ static int yam_info_open(struct inode *inode, struct file *file) | |||
804 | return seq_open(file, &yam_seqops); | 804 | return seq_open(file, &yam_seqops); |
805 | } | 805 | } |
806 | 806 | ||
807 | static struct file_operations yam_info_fops = { | 807 | static const struct file_operations yam_info_fops = { |
808 | .owner = THIS_MODULE, | 808 | .owner = THIS_MODULE, |
809 | .open = yam_info_open, | 809 | .open = yam_info_open, |
810 | .read = seq_read, | 810 | .read = seq_read, |
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 99343b5836b8..458db0538a9a 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -1156,7 +1156,7 @@ static int ibmveth_proc_open(struct inode *inode, struct file *file) | |||
1156 | return rc; | 1156 | return rc; |
1157 | } | 1157 | } |
1158 | 1158 | ||
1159 | static struct file_operations ibmveth_proc_fops = { | 1159 | static const struct file_operations ibmveth_proc_fops = { |
1160 | .owner = THIS_MODULE, | 1160 | .owner = THIS_MODULE, |
1161 | .open = ibmveth_proc_open, | 1161 | .open = ibmveth_proc_open, |
1162 | .read = seq_read, | 1162 | .read = seq_read, |
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index e2b1af618450..3457e9d8b667 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -385,7 +385,7 @@ static int vlsi_seq_open(struct inode *inode, struct file *file) | |||
385 | return single_open(file, vlsi_seq_show, PDE(inode)->data); | 385 | return single_open(file, vlsi_seq_show, PDE(inode)->data); |
386 | } | 386 | } |
387 | 387 | ||
388 | static struct file_operations vlsi_proc_fops = { | 388 | static const struct file_operations vlsi_proc_fops = { |
389 | .owner = THIS_MODULE, | 389 | .owner = THIS_MODULE, |
390 | .open = vlsi_seq_open, | 390 | .open = vlsi_seq_open, |
391 | .read = seq_read, | 391 | .read = seq_read, |
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 0986f6c843e6..11b575f89856 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
@@ -834,7 +834,7 @@ static int ppp_unattached_ioctl(struct ppp_file *pf, struct file *file, | |||
834 | return err; | 834 | return err; |
835 | } | 835 | } |
836 | 836 | ||
837 | static struct file_operations ppp_device_fops = { | 837 | static const struct file_operations ppp_device_fops = { |
838 | .owner = THIS_MODULE, | 838 | .owner = THIS_MODULE, |
839 | .read = ppp_read, | 839 | .read = ppp_read, |
840 | .write = ppp_write, | 840 | .write = ppp_write, |
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 315d5c3fc66a..860bb0f60f68 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
@@ -1043,7 +1043,7 @@ static int pppoe_seq_open(struct inode *inode, struct file *file) | |||
1043 | return seq_open(file, &pppoe_seq_ops); | 1043 | return seq_open(file, &pppoe_seq_ops); |
1044 | } | 1044 | } |
1045 | 1045 | ||
1046 | static struct file_operations pppoe_seq_fops = { | 1046 | static const struct file_operations pppoe_seq_fops = { |
1047 | .owner = THIS_MODULE, | 1047 | .owner = THIS_MODULE, |
1048 | .open = pppoe_seq_open, | 1048 | .open = pppoe_seq_open, |
1049 | .read = seq_read, | 1049 | .read = seq_read, |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 151a2e10e4f3..5643d1e84ed6 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
@@ -744,7 +744,7 @@ static int tun_chr_close(struct inode *inode, struct file *file) | |||
744 | return 0; | 744 | return 0; |
745 | } | 745 | } |
746 | 746 | ||
747 | static struct file_operations tun_fops = { | 747 | static const struct file_operations tun_fops = { |
748 | .owner = THIS_MODULE, | 748 | .owner = THIS_MODULE, |
749 | .llseek = no_llseek, | 749 | .llseek = no_llseek, |
750 | .read = do_sync_read, | 750 | .read = do_sync_read, |
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 6c7dfb50143f..e91b5a84a20a 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c | |||
@@ -311,7 +311,7 @@ static int cosa_chardev_ioctl(struct inode *inode, struct file *file, | |||
311 | static int cosa_fasync(struct inode *inode, struct file *file, int on); | 311 | static int cosa_fasync(struct inode *inode, struct file *file, int on); |
312 | #endif | 312 | #endif |
313 | 313 | ||
314 | static struct file_operations cosa_fops = { | 314 | static const struct file_operations cosa_fops = { |
315 | .owner = THIS_MODULE, | 315 | .owner = THIS_MODULE, |
316 | .llseek = no_llseek, | 316 | .llseek = no_llseek, |
317 | .read = cosa_read, | 317 | .read = cosa_read, |
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 44a22701da97..b08055abe83a 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -4430,53 +4430,53 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ); | |||
4430 | static int proc_config_open( struct inode *inode, struct file *file ); | 4430 | static int proc_config_open( struct inode *inode, struct file *file ); |
4431 | static int proc_wepkey_open( struct inode *inode, struct file *file ); | 4431 | static int proc_wepkey_open( struct inode *inode, struct file *file ); |
4432 | 4432 | ||
4433 | static struct file_operations proc_statsdelta_ops = { | 4433 | static const struct file_operations proc_statsdelta_ops = { |
4434 | .read = proc_read, | 4434 | .read = proc_read, |
4435 | .open = proc_statsdelta_open, | 4435 | .open = proc_statsdelta_open, |
4436 | .release = proc_close | 4436 | .release = proc_close |
4437 | }; | 4437 | }; |
4438 | 4438 | ||
4439 | static struct file_operations proc_stats_ops = { | 4439 | static const struct file_operations proc_stats_ops = { |
4440 | .read = proc_read, | 4440 | .read = proc_read, |
4441 | .open = proc_stats_open, | 4441 | .open = proc_stats_open, |
4442 | .release = proc_close | 4442 | .release = proc_close |
4443 | }; | 4443 | }; |
4444 | 4444 | ||
4445 | static struct file_operations proc_status_ops = { | 4445 | static const struct file_operations proc_status_ops = { |
4446 | .read = proc_read, | 4446 | .read = proc_read, |
4447 | .open = proc_status_open, | 4447 | .open = proc_status_open, |
4448 | .release = proc_close | 4448 | .release = proc_close |
4449 | }; | 4449 | }; |
4450 | 4450 | ||
4451 | static struct file_operations proc_SSID_ops = { | 4451 | static const struct file_operations proc_SSID_ops = { |
4452 | .read = proc_read, | 4452 | .read = proc_read, |
4453 | .write = proc_write, | 4453 | .write = proc_write, |
4454 | .open = proc_SSID_open, | 4454 | .open = proc_SSID_open, |
4455 | .release = proc_close | 4455 | .release = proc_close |
4456 | }; | 4456 | }; |
4457 | 4457 | ||
4458 | static struct file_operations proc_BSSList_ops = { | 4458 | static const struct file_operations proc_BSSList_ops = { |
4459 | .read = proc_read, | 4459 | .read = proc_read, |
4460 | .write = proc_write, | 4460 | .write = proc_write, |
4461 | .open = proc_BSSList_open, | 4461 | .open = proc_BSSList_open, |
4462 | .release = proc_close | 4462 | .release = proc_close |
4463 | }; | 4463 | }; |
4464 | 4464 | ||
4465 | static struct file_operations proc_APList_ops = { | 4465 | static const struct file_operations proc_APList_ops = { |
4466 | .read = proc_read, | 4466 | .read = proc_read, |
4467 | .write = proc_write, | 4467 | .write = proc_write, |
4468 | .open = proc_APList_open, | 4468 | .open = proc_APList_open, |
4469 | .release = proc_close | 4469 | .release = proc_close |
4470 | }; | 4470 | }; |
4471 | 4471 | ||
4472 | static struct file_operations proc_config_ops = { | 4472 | static const struct file_operations proc_config_ops = { |
4473 | .read = proc_read, | 4473 | .read = proc_read, |
4474 | .write = proc_write, | 4474 | .write = proc_write, |
4475 | .open = proc_config_open, | 4475 | .open = proc_config_open, |
4476 | .release = proc_close | 4476 | .release = proc_close |
4477 | }; | 4477 | }; |
4478 | 4478 | ||
4479 | static struct file_operations proc_wepkey_ops = { | 4479 | static const struct file_operations proc_wepkey_ops = { |
4480 | .read = proc_read, | 4480 | .read = proc_read, |
4481 | .write = proc_write, | 4481 | .write = proc_write, |
4482 | .open = proc_wepkey_open, | 4482 | .open = proc_wepkey_open, |
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c index b9df06a06ea9..35dbe4554513 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | |||
@@ -355,37 +355,37 @@ out_up: | |||
355 | #undef fappend | 355 | #undef fappend |
356 | 356 | ||
357 | 357 | ||
358 | static struct file_operations devinfo_fops = { | 358 | static const struct file_operations devinfo_fops = { |
359 | .read = devinfo_read_file, | 359 | .read = devinfo_read_file, |
360 | .write = write_file_dummy, | 360 | .write = write_file_dummy, |
361 | .open = open_file_generic, | 361 | .open = open_file_generic, |
362 | }; | 362 | }; |
363 | 363 | ||
364 | static struct file_operations spromdump_fops = { | 364 | static const struct file_operations spromdump_fops = { |
365 | .read = spromdump_read_file, | 365 | .read = spromdump_read_file, |
366 | .write = write_file_dummy, | 366 | .write = write_file_dummy, |
367 | .open = open_file_generic, | 367 | .open = open_file_generic, |
368 | }; | 368 | }; |
369 | 369 | ||
370 | static struct file_operations drvinfo_fops = { | 370 | static const struct file_operations drvinfo_fops = { |
371 | .read = drvinfo_read_file, | 371 | .read = drvinfo_read_file, |
372 | .write = write_file_dummy, | 372 | .write = write_file_dummy, |
373 | .open = open_file_generic, | 373 | .open = open_file_generic, |
374 | }; | 374 | }; |
375 | 375 | ||
376 | static struct file_operations tsf_fops = { | 376 | static const struct file_operations tsf_fops = { |
377 | .read = tsf_read_file, | 377 | .read = tsf_read_file, |
378 | .write = tsf_write_file, | 378 | .write = tsf_write_file, |
379 | .open = open_file_generic, | 379 | .open = open_file_generic, |
380 | }; | 380 | }; |
381 | 381 | ||
382 | static struct file_operations txstat_fops = { | 382 | static const struct file_operations txstat_fops = { |
383 | .read = txstat_read_file, | 383 | .read = txstat_read_file, |
384 | .write = write_file_dummy, | 384 | .write = write_file_dummy, |
385 | .open = open_file_generic, | 385 | .open = open_file_generic, |
386 | }; | 386 | }; |
387 | 387 | ||
388 | static struct file_operations restart_fops = { | 388 | static const struct file_operations restart_fops = { |
389 | .write = restart_write_file, | 389 | .write = restart_write_file, |
390 | .open = open_file_generic, | 390 | .open = open_file_generic, |
391 | }; | 391 | }; |
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index ce3a8bac66ff..f5ce1c6063d8 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c | |||
@@ -1160,7 +1160,7 @@ static int strip_seq_open(struct inode *inode, struct file *file) | |||
1160 | return seq_open(file, &strip_seq_ops); | 1160 | return seq_open(file, &strip_seq_ops); |
1161 | } | 1161 | } |
1162 | 1162 | ||
1163 | static struct file_operations strip_seq_fops = { | 1163 | static const struct file_operations strip_seq_fops = { |
1164 | .owner = THIS_MODULE, | 1164 | .owner = THIS_MODULE, |
1165 | .open = strip_seq_open, | 1165 | .open = strip_seq_open, |
1166 | .read = seq_read, | 1166 | .read = seq_read, |