[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>
This commit is contained in:
Stephen Hemminger 2008-01-31 04:08:39 -08:00 committed by David S. Miller
parent 2f0d2f1039
commit f4f6fb714f
2 changed files with 4 additions and 2 deletions

View File

@ -148,12 +148,12 @@ static const struct nf_nat_protocol gre = {
#endif #endif
}; };
int __init nf_nat_proto_gre_init(void) static int __init nf_nat_proto_gre_init(void)
{ {
return nf_nat_protocol_register(&gre); return nf_nat_protocol_register(&gre);
} }
void __exit nf_nat_proto_gre_fini(void) static void __exit nf_nat_proto_gre_fini(void)
{ {
nf_nat_protocol_unregister(&gre); nf_nat_protocol_unregister(&gre);
} }

View File

@ -624,6 +624,7 @@ static struct xt_match hashlimit_mt_reg[] __read_mostly = {
/* PROC stuff */ /* PROC stuff */
static void *dl_seq_start(struct seq_file *s, loff_t *pos) static void *dl_seq_start(struct seq_file *s, loff_t *pos)
__acquires(htable->lock)
{ {
struct proc_dir_entry *pde = s->private; struct proc_dir_entry *pde = s->private;
struct xt_hashlimit_htable *htable = pde->data; 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)
} }
static void dl_seq_stop(struct seq_file *s, void *v) static void dl_seq_stop(struct seq_file *s, void *v)
__releases(htable->lock)
{ {
struct proc_dir_entry *pde = s->private; struct proc_dir_entry *pde = s->private;
struct xt_hashlimit_htable *htable = pde->data; struct xt_hashlimit_htable *htable = pde->data;