aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2007-02-12 03:55:35 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:46 -0500
commit9a32144e9d7b4e21341174b1a83b82a82353be86 (patch)
tree6f08560b341418fc9934f56f6162a95f5b5d8aec /net/ipv4
parent00977a59b951207d38380c75f03a36829950265c (diff)
[PATCH] mark struct file_operations const 7
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 'net/ipv4')
-rw-r--r--net/ipv4/arp.c2
-rw-r--r--net/ipv4/fib_hash.c2
-rw-r--r--net/ipv4/fib_trie.c6
-rw-r--r--net/ipv4/igmp.c4
-rw-r--r--net/ipv4/ipconfig.c2
-rw-r--r--net/ipv4/ipmr.c4
-rw-r--r--net/ipv4/ipvs/ip_vs_app.c2
-rw-r--r--net/ipv4/ipvs/ip_vs_conn.c2
-rw-r--r--net/ipv4/ipvs/ip_vs_ctl.c4
-rw-r--r--net/ipv4/netfilter/ip_conntrack_standalone.c6
-rw-r--r--net/ipv4/netfilter/ipt_CLUSTERIP.c4
-rw-r--r--net/ipv4/netfilter/ipt_recent.c4
-rw-r--r--net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c6
-rw-r--r--net/ipv4/proc.c6
-rw-r--r--net/ipv4/raw.c2
-rw-r--r--net/ipv4/route.c4
-rw-r--r--net/ipv4/tcp_probe.c2
17 files changed, 31 insertions, 31 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index a58afde4f72f..0ffd2d2920c3 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1390,7 +1390,7 @@ out_kfree:
1390 goto out; 1390 goto out;
1391} 1391}
1392 1392
1393static struct file_operations arp_seq_fops = { 1393static const struct file_operations arp_seq_fops = {
1394 .owner = THIS_MODULE, 1394 .owner = THIS_MODULE,
1395 .open = arp_seq_open, 1395 .open = arp_seq_open,
1396 .read = seq_read, 1396 .read = seq_read,
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index dea04d725b04..b21bb28d1fd0 100644
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -1057,7 +1057,7 @@ out_kfree:
1057 goto out; 1057 goto out;
1058} 1058}
1059 1059
1060static struct file_operations fib_seq_fops = { 1060static const struct file_operations fib_seq_fops = {
1061 .owner = THIS_MODULE, 1061 .owner = THIS_MODULE,
1062 .open = fib_seq_open, 1062 .open = fib_seq_open,
1063 .read = seq_read, 1063 .read = seq_read,
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 004a437bd7b5..c33dca073801 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2173,7 +2173,7 @@ static int fib_triestat_seq_open(struct inode *inode, struct file *file)
2173 return single_open(file, fib_triestat_seq_show, NULL); 2173 return single_open(file, fib_triestat_seq_show, NULL);
2174} 2174}
2175 2175
2176static struct file_operations fib_triestat_fops = { 2176static const struct file_operations fib_triestat_fops = {
2177 .owner = THIS_MODULE, 2177 .owner = THIS_MODULE,
2178 .open = fib_triestat_seq_open, 2178 .open = fib_triestat_seq_open,
2179 .read = seq_read, 2179 .read = seq_read,
@@ -2364,7 +2364,7 @@ out_kfree:
2364 goto out; 2364 goto out;
2365} 2365}
2366 2366
2367static struct file_operations fib_trie_fops = { 2367static const struct file_operations fib_trie_fops = {
2368 .owner = THIS_MODULE, 2368 .owner = THIS_MODULE,
2369 .open = fib_trie_seq_open, 2369 .open = fib_trie_seq_open,
2370 .read = seq_read, 2370 .read = seq_read,
@@ -2485,7 +2485,7 @@ out_kfree:
2485 goto out; 2485 goto out;
2486} 2486}
2487 2487
2488static struct file_operations fib_route_fops = { 2488static const struct file_operations fib_route_fops = {
2489 .owner = THIS_MODULE, 2489 .owner = THIS_MODULE,
2490 .open = fib_route_seq_open, 2490 .open = fib_route_seq_open,
2491 .read = seq_read, 2491 .read = seq_read,
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index b8e1625d34cf..063721302ebf 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2403,7 +2403,7 @@ out_kfree:
2403 goto out; 2403 goto out;
2404} 2404}
2405 2405
2406static struct file_operations igmp_mc_seq_fops = { 2406static const struct file_operations igmp_mc_seq_fops = {
2407 .owner = THIS_MODULE, 2407 .owner = THIS_MODULE,
2408 .open = igmp_mc_seq_open, 2408 .open = igmp_mc_seq_open,
2409 .read = seq_read, 2409 .read = seq_read,
@@ -2577,7 +2577,7 @@ out_kfree:
2577 goto out; 2577 goto out;
2578} 2578}
2579 2579
2580static struct file_operations igmp_mcf_seq_fops = { 2580static const struct file_operations igmp_mcf_seq_fops = {
2581 .owner = THIS_MODULE, 2581 .owner = THIS_MODULE,
2582 .open = igmp_mcf_seq_open, 2582 .open = igmp_mcf_seq_open,
2583 .read = seq_read, 2583 .read = seq_read,
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index ba882bec317a..cf49de1a4983 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1200,7 +1200,7 @@ static int pnp_seq_open(struct inode *indoe, struct file *file)
1200 return single_open(file, pnp_seq_show, NULL); 1200 return single_open(file, pnp_seq_show, NULL);
1201} 1201}
1202 1202
1203static struct file_operations pnp_seq_fops = { 1203static const struct file_operations pnp_seq_fops = {
1204 .owner = THIS_MODULE, 1204 .owner = THIS_MODULE,
1205 .open = pnp_seq_open, 1205 .open = pnp_seq_open,
1206 .read = seq_read, 1206 .read = seq_read,
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 604f5b585104..e6d11abd7841 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1712,7 +1712,7 @@ out_kfree:
1712 1712
1713} 1713}
1714 1714
1715static struct file_operations ipmr_vif_fops = { 1715static const struct file_operations ipmr_vif_fops = {
1716 .owner = THIS_MODULE, 1716 .owner = THIS_MODULE,
1717 .open = ipmr_vif_open, 1717 .open = ipmr_vif_open,
1718 .read = seq_read, 1718 .read = seq_read,
@@ -1874,7 +1874,7 @@ out_kfree:
1874 1874
1875} 1875}
1876 1876
1877static struct file_operations ipmr_mfc_fops = { 1877static const struct file_operations ipmr_mfc_fops = {
1878 .owner = THIS_MODULE, 1878 .owner = THIS_MODULE,
1879 .open = ipmr_mfc_open, 1879 .open = ipmr_mfc_open,
1880 .read = seq_read, 1880 .read = seq_read,
diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c
index 6c40899aa161..22e104c6a493 100644
--- a/net/ipv4/ipvs/ip_vs_app.c
+++ b/net/ipv4/ipvs/ip_vs_app.c
@@ -561,7 +561,7 @@ static int ip_vs_app_open(struct inode *inode, struct file *file)
561 return seq_open(file, &ip_vs_app_seq_ops); 561 return seq_open(file, &ip_vs_app_seq_ops);
562} 562}
563 563
564static struct file_operations ip_vs_app_fops = { 564static const struct file_operations ip_vs_app_fops = {
565 .owner = THIS_MODULE, 565 .owner = THIS_MODULE,
566 .open = ip_vs_app_open, 566 .open = ip_vs_app_open,
567 .read = seq_read, 567 .read = seq_read,
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index 0b5e03476ce4..7018f97c75dc 100644
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -757,7 +757,7 @@ static int ip_vs_conn_open(struct inode *inode, struct file *file)
757 return seq_open(file, &ip_vs_conn_seq_ops); 757 return seq_open(file, &ip_vs_conn_seq_ops);
758} 758}
759 759
760static struct file_operations ip_vs_conn_fops = { 760static const struct file_operations ip_vs_conn_fops = {
761 .owner = THIS_MODULE, 761 .owner = THIS_MODULE,
762 .open = ip_vs_conn_open, 762 .open = ip_vs_conn_open,
763 .read = seq_read, 763 .read = seq_read,
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
index 9b933381ebbe..8b08d9cdcbc8 100644
--- a/net/ipv4/ipvs/ip_vs_ctl.c
+++ b/net/ipv4/ipvs/ip_vs_ctl.c
@@ -1812,7 +1812,7 @@ out_kfree:
1812 goto out; 1812 goto out;
1813} 1813}
1814 1814
1815static struct file_operations ip_vs_info_fops = { 1815static const struct file_operations ip_vs_info_fops = {
1816 .owner = THIS_MODULE, 1816 .owner = THIS_MODULE,
1817 .open = ip_vs_info_open, 1817 .open = ip_vs_info_open,
1818 .read = seq_read, 1818 .read = seq_read,
@@ -1859,7 +1859,7 @@ static int ip_vs_stats_seq_open(struct inode *inode, struct file *file)
1859 return single_open(file, ip_vs_stats_show, NULL); 1859 return single_open(file, ip_vs_stats_show, NULL);
1860} 1860}
1861 1861
1862static struct file_operations ip_vs_stats_fops = { 1862static const struct file_operations ip_vs_stats_fops = {
1863 .owner = THIS_MODULE, 1863 .owner = THIS_MODULE,
1864 .open = ip_vs_stats_seq_open, 1864 .open = ip_vs_stats_seq_open,
1865 .read = seq_read, 1865 .read = seq_read,
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 5903588fddce..300ccbbbdac9 100644
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -222,7 +222,7 @@ out_free:
222 return ret; 222 return ret;
223} 223}
224 224
225static struct file_operations ct_file_ops = { 225static const struct file_operations ct_file_ops = {
226 .owner = THIS_MODULE, 226 .owner = THIS_MODULE,
227 .open = ct_open, 227 .open = ct_open,
228 .read = seq_read, 228 .read = seq_read,
@@ -298,7 +298,7 @@ static int exp_open(struct inode *inode, struct file *file)
298 return seq_open(file, &exp_seq_ops); 298 return seq_open(file, &exp_seq_ops);
299} 299}
300 300
301static struct file_operations exp_file_ops = { 301static const struct file_operations exp_file_ops = {
302 .owner = THIS_MODULE, 302 .owner = THIS_MODULE,
303 .open = exp_open, 303 .open = exp_open,
304 .read = seq_read, 304 .read = seq_read,
@@ -386,7 +386,7 @@ static int ct_cpu_seq_open(struct inode *inode, struct file *file)
386 return seq_open(file, &ct_cpu_seq_ops); 386 return seq_open(file, &ct_cpu_seq_ops);
387} 387}
388 388
389static struct file_operations ct_cpu_seq_fops = { 389static const struct file_operations ct_cpu_seq_fops = {
390 .owner = THIS_MODULE, 390 .owner = THIS_MODULE,
391 .open = ct_cpu_seq_open, 391 .open = ct_cpu_seq_open,
392 .read = seq_read, 392 .read = seq_read,
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 4fe28f264475..e965b333c997 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -70,7 +70,7 @@ static LIST_HEAD(clusterip_configs);
70static DEFINE_RWLOCK(clusterip_lock); 70static DEFINE_RWLOCK(clusterip_lock);
71 71
72#ifdef CONFIG_PROC_FS 72#ifdef CONFIG_PROC_FS
73static struct file_operations clusterip_proc_fops; 73static const struct file_operations clusterip_proc_fops;
74static struct proc_dir_entry *clusterip_procdir; 74static struct proc_dir_entry *clusterip_procdir;
75#endif 75#endif
76 76
@@ -715,7 +715,7 @@ static ssize_t clusterip_proc_write(struct file *file, const char __user *input,
715 return size; 715 return size;
716} 716}
717 717
718static struct file_operations clusterip_proc_fops = { 718static const struct file_operations clusterip_proc_fops = {
719 .owner = THIS_MODULE, 719 .owner = THIS_MODULE,
720 .open = clusterip_proc_open, 720 .open = clusterip_proc_open,
721 .read = seq_read, 721 .read = seq_read,
diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
index 6b97b6796173..aecb9c48e152 100644
--- a/net/ipv4/netfilter/ipt_recent.c
+++ b/net/ipv4/netfilter/ipt_recent.c
@@ -79,7 +79,7 @@ static DEFINE_MUTEX(recent_mutex);
79 79
80#ifdef CONFIG_PROC_FS 80#ifdef CONFIG_PROC_FS
81static struct proc_dir_entry *proc_dir; 81static struct proc_dir_entry *proc_dir;
82static struct file_operations recent_fops; 82static const struct file_operations recent_fops;
83#endif 83#endif
84 84
85static u_int32_t hash_rnd; 85static u_int32_t hash_rnd;
@@ -454,7 +454,7 @@ static ssize_t recent_proc_write(struct file *file, const char __user *input,
454 return size; 454 return size;
455} 455}
456 456
457static struct file_operations recent_fops = { 457static const struct file_operations recent_fops = {
458 .open = recent_seq_open, 458 .open = recent_seq_open,
459 .read = seq_read, 459 .read = seq_read,
460 .write = recent_proc_write, 460 .write = recent_proc_write,
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index 14a93a738418..89f933e81035 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -197,7 +197,7 @@ out_free:
197 return ret; 197 return ret;
198} 198}
199 199
200static struct file_operations ct_file_ops = { 200static const struct file_operations ct_file_ops = {
201 .owner = THIS_MODULE, 201 .owner = THIS_MODULE,
202 .open = ct_open, 202 .open = ct_open,
203 .read = seq_read, 203 .read = seq_read,
@@ -278,7 +278,7 @@ static int exp_open(struct inode *inode, struct file *file)
278 return seq_open(file, &exp_seq_ops); 278 return seq_open(file, &exp_seq_ops);
279} 279}
280 280
281static struct file_operations ip_exp_file_ops = { 281static const struct file_operations ip_exp_file_ops = {
282 .owner = THIS_MODULE, 282 .owner = THIS_MODULE,
283 .open = exp_open, 283 .open = exp_open,
284 .read = seq_read, 284 .read = seq_read,
@@ -366,7 +366,7 @@ static int ct_cpu_seq_open(struct inode *inode, struct file *file)
366 return seq_open(file, &ct_cpu_seq_ops); 366 return seq_open(file, &ct_cpu_seq_ops);
367} 367}
368 368
369static struct file_operations ct_cpu_seq_fops = { 369static const struct file_operations ct_cpu_seq_fops = {
370 .owner = THIS_MODULE, 370 .owner = THIS_MODULE,
371 .open = ct_cpu_seq_open, 371 .open = ct_cpu_seq_open,
372 .read = seq_read, 372 .read = seq_read,
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index ccb199e9dd8b..ae68a691e8cd 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -79,7 +79,7 @@ static int sockstat_seq_open(struct inode *inode, struct file *file)
79 return single_open(file, sockstat_seq_show, NULL); 79 return single_open(file, sockstat_seq_show, NULL);
80} 80}
81 81
82static struct file_operations sockstat_seq_fops = { 82static const struct file_operations sockstat_seq_fops = {
83 .owner = THIS_MODULE, 83 .owner = THIS_MODULE,
84 .open = sockstat_seq_open, 84 .open = sockstat_seq_open,
85 .read = seq_read, 85 .read = seq_read,
@@ -326,7 +326,7 @@ static int snmp_seq_open(struct inode *inode, struct file *file)
326 return single_open(file, snmp_seq_show, NULL); 326 return single_open(file, snmp_seq_show, NULL);
327} 327}
328 328
329static struct file_operations snmp_seq_fops = { 329static const struct file_operations snmp_seq_fops = {
330 .owner = THIS_MODULE, 330 .owner = THIS_MODULE,
331 .open = snmp_seq_open, 331 .open = snmp_seq_open,
332 .read = seq_read, 332 .read = seq_read,
@@ -360,7 +360,7 @@ static int netstat_seq_open(struct inode *inode, struct file *file)
360 return single_open(file, netstat_seq_show, NULL); 360 return single_open(file, netstat_seq_show, NULL);
361} 361}
362 362
363static struct file_operations netstat_seq_fops = { 363static const struct file_operations netstat_seq_fops = {
364 .owner = THIS_MODULE, 364 .owner = THIS_MODULE,
365 .open = netstat_seq_open, 365 .open = netstat_seq_open,
366 .read = seq_read, 366 .read = seq_read,
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 931084bfb572..87e9c1618100 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -916,7 +916,7 @@ out_kfree:
916 goto out; 916 goto out;
917} 917}
918 918
919static struct file_operations raw_seq_fops = { 919static const struct file_operations raw_seq_fops = {
920 .owner = THIS_MODULE, 920 .owner = THIS_MODULE,
921 .open = raw_seq_open, 921 .open = raw_seq_open,
922 .read = seq_read, 922 .read = seq_read,
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 5b3834b38a2d..9b5e56481d53 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -393,7 +393,7 @@ out_kfree:
393 goto out; 393 goto out;
394} 394}
395 395
396static struct file_operations rt_cache_seq_fops = { 396static const struct file_operations rt_cache_seq_fops = {
397 .owner = THIS_MODULE, 397 .owner = THIS_MODULE,
398 .open = rt_cache_seq_open, 398 .open = rt_cache_seq_open,
399 .read = seq_read, 399 .read = seq_read,
@@ -484,7 +484,7 @@ static int rt_cpu_seq_open(struct inode *inode, struct file *file)
484 return seq_open(file, &rt_cpu_seq_ops); 484 return seq_open(file, &rt_cpu_seq_ops);
485} 485}
486 486
487static struct file_operations rt_cpu_seq_fops = { 487static const struct file_operations rt_cpu_seq_fops = {
488 .owner = THIS_MODULE, 488 .owner = THIS_MODULE,
489 .open = rt_cpu_seq_open, 489 .open = rt_cpu_seq_open,
490 .read = seq_read, 490 .read = seq_read,
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index 41c157848181..61f406f27294 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -143,7 +143,7 @@ out_free:
143 return error ? error : cnt; 143 return error ? error : cnt;
144} 144}
145 145
146static struct file_operations tcpprobe_fops = { 146static const struct file_operations tcpprobe_fops = {
147 .owner = THIS_MODULE, 147 .owner = THIS_MODULE,
148 .open = tcpprobe_open, 148 .open = tcpprobe_open,
149 .read = tcpprobe_read, 149 .read = tcpprobe_read,