diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-01-31 07:08:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:27:46 -0500 |
commit | f4f6fb714f139f45f90c6a5048ee67f9960543f1 (patch) | |
tree | dd9a67535c4bf77668287f8650781ee10452ac25 | |
parent | 2f0d2f10391e190f940da70cbdc8a61e4dad98eb (diff) |
[NETFILTER]: more sparse fixes
Some lock annotations, and make initializers static.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_gre.c | 4 | ||||
-rw-r--r-- | net/netfilter/xt_hashlimit.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_nat_proto_gre.c b/net/ipv4/netfilter/nf_nat_proto_gre.c index 9fa272e73113..c9dbd550df39 100644 --- a/net/ipv4/netfilter/nf_nat_proto_gre.c +++ b/net/ipv4/netfilter/nf_nat_proto_gre.c | |||
@@ -148,12 +148,12 @@ static const struct nf_nat_protocol gre = { | |||
148 | #endif | 148 | #endif |
149 | }; | 149 | }; |
150 | 150 | ||
151 | int __init nf_nat_proto_gre_init(void) | 151 | static int __init nf_nat_proto_gre_init(void) |
152 | { | 152 | { |
153 | return nf_nat_protocol_register(&gre); | 153 | return nf_nat_protocol_register(&gre); |
154 | } | 154 | } |
155 | 155 | ||
156 | void __exit nf_nat_proto_gre_fini(void) | 156 | static void __exit nf_nat_proto_gre_fini(void) |
157 | { | 157 | { |
158 | nf_nat_protocol_unregister(&gre); | 158 | nf_nat_protocol_unregister(&gre); |
159 | } | 159 | } |
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index d479ca980115..b224b8f719a4 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c | |||
@@ -624,6 +624,7 @@ static struct xt_match hashlimit_mt_reg[] __read_mostly = { | |||
624 | 624 | ||
625 | /* PROC stuff */ | 625 | /* PROC stuff */ |
626 | static void *dl_seq_start(struct seq_file *s, loff_t *pos) | 626 | static void *dl_seq_start(struct seq_file *s, loff_t *pos) |
627 | __acquires(htable->lock) | ||
627 | { | 628 | { |
628 | struct proc_dir_entry *pde = s->private; | 629 | struct proc_dir_entry *pde = s->private; |
629 | struct xt_hashlimit_htable *htable = pde->data; | 630 | struct xt_hashlimit_htable *htable = pde->data; |
@@ -656,6 +657,7 @@ static void *dl_seq_next(struct seq_file *s, void *v, loff_t *pos) | |||
656 | } | 657 | } |
657 | 658 | ||
658 | static void dl_seq_stop(struct seq_file *s, void *v) | 659 | static void dl_seq_stop(struct seq_file *s, void *v) |
660 | __releases(htable->lock) | ||
659 | { | 661 | { |
660 | struct proc_dir_entry *pde = s->private; | 662 | struct proc_dir_entry *pde = s->private; |
661 | struct xt_hashlimit_htable *htable = pde->data; | 663 | struct xt_hashlimit_htable *htable = pde->data; |