[PATCH 7/8] netfilter: more spase fixes

[Stephen Hemminger <shemminger@vyatta.com>]

[-- Attachment #1: nf-yms.patch --]
[-- Type: text/plain, Size: 1321 bytes --]

Some lock annotations, and make initializers static.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>


--- a/net/netfilter/xt_hashlimit.c	2008-01-24 10:10:46.000000000 -0800
+++ b/net/netfilter/xt_hashlimit.c	2008-01-24 10:12:30.000000000 -0800
@@ -624,6 +624,7 @@ static struct xt_match hashlimit_mt_reg[
 
 /* PROC stuff */
 static void *dl_seq_start(struct seq_file *s, loff_t *pos)
+	__acquires(htable->lock)
 {
 	struct proc_dir_entry *pde = s->private;
 	struct xt_hashlimit_htable *htable = pde->data;
@@ -656,6 +657,7 @@ static void *dl_seq_next(struct seq_file
 }
 
 static void dl_seq_stop(struct seq_file *s, void *v)
+	__releases(htable->lock)
 {
 	struct proc_dir_entry *pde = s->private;
 	struct xt_hashlimit_htable *htable = pde->data;
--- a/net/ipv4/netfilter/nf_nat_proto_gre.c	2008-01-24 10:10:46.000000000 -0800
+++ b/net/ipv4/netfilter/nf_nat_proto_gre.c	2008-01-24 10:12:30.000000000 -0800
@@ -148,12 +148,12 @@ static const struct nf_nat_protocol gre 
 #endif
 };
 
-int __init nf_nat_proto_gre_init(void)
+static int __init nf_nat_proto_gre_init(void)
 {
 	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);
 }

-- 
Stephen Hemminger <stephen.hemminger@vyatta.com>