tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[NETFILTER]: Use non-deprecated __RW_LOCK_UNLOCKED macro

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Patrick McHardy <kaber@trash.net>

authored by

Robert P. J. Day and committed by
Patrick McHardy fdccecd0 0718300c

+8 -8
+1 -1
net/ipv4/netfilter/arptable_filter.c
··· 48 48 static struct arpt_table packet_filter = { 49 49 .name = "filter", 50 50 .valid_hooks = FILTER_VALID_HOOKS, 51 - .lock = RW_LOCK_UNLOCKED, 51 + .lock = __RW_LOCK_UNLOCKED(packet_filter.lock), 52 52 .private = NULL, 53 53 .me = THIS_MODULE, 54 54 .af = NF_ARP,
+1 -1
net/ipv4/netfilter/iptable_filter.c
··· 56 56 static struct xt_table packet_filter = { 57 57 .name = "filter", 58 58 .valid_hooks = FILTER_VALID_HOOKS, 59 - .lock = RW_LOCK_UNLOCKED, 59 + .lock = __RW_LOCK_UNLOCKED(packet_filter.lock), 60 60 .me = THIS_MODULE, 61 61 .af = AF_INET, 62 62 };
+1 -1
net/ipv4/netfilter/iptable_mangle.c
··· 67 67 static struct xt_table packet_mangler = { 68 68 .name = "mangle", 69 69 .valid_hooks = MANGLE_VALID_HOOKS, 70 - .lock = RW_LOCK_UNLOCKED, 70 + .lock = __RW_LOCK_UNLOCKED(packet_mangler.lock), 71 71 .me = THIS_MODULE, 72 72 .af = AF_INET, 73 73 };
+1 -1
net/ipv4/netfilter/iptable_raw.c
··· 39 39 static struct xt_table packet_raw = { 40 40 .name = "raw", 41 41 .valid_hooks = RAW_VALID_HOOKS, 42 - .lock = RW_LOCK_UNLOCKED, 42 + .lock = __RW_LOCK_UNLOCKED(packet_raw.lock), 43 43 .me = THIS_MODULE, 44 44 .af = AF_INET, 45 45 };
+1 -1
net/ipv4/netfilter/nf_nat_rule.c
··· 61 61 static struct xt_table __nat_table = { 62 62 .name = "nat", 63 63 .valid_hooks = NAT_VALID_HOOKS, 64 - .lock = RW_LOCK_UNLOCKED, 64 + .lock = __RW_LOCK_UNLOCKED(__nat_table.lock), 65 65 .me = THIS_MODULE, 66 66 .af = AF_INET, 67 67 };
+1 -1
net/ipv6/netfilter/ip6table_filter.c
··· 54 54 static struct xt_table packet_filter = { 55 55 .name = "filter", 56 56 .valid_hooks = FILTER_VALID_HOOKS, 57 - .lock = RW_LOCK_UNLOCKED, 57 + .lock = __RW_LOCK_UNLOCKED(packet_filter.lock), 58 58 .me = THIS_MODULE, 59 59 .af = AF_INET6, 60 60 };
+1 -1
net/ipv6/netfilter/ip6table_mangle.c
··· 60 60 static struct xt_table packet_mangler = { 61 61 .name = "mangle", 62 62 .valid_hooks = MANGLE_VALID_HOOKS, 63 - .lock = RW_LOCK_UNLOCKED, 63 + .lock = __RW_LOCK_UNLOCKED(packet_mangler.lock), 64 64 .me = THIS_MODULE, 65 65 .af = AF_INET6, 66 66 };
+1 -1
net/ipv6/netfilter/ip6table_raw.c
··· 38 38 static struct xt_table packet_raw = { 39 39 .name = "raw", 40 40 .valid_hooks = RAW_VALID_HOOKS, 41 - .lock = RW_LOCK_UNLOCKED, 41 + .lock = __RW_LOCK_UNLOCKED(packet_raw.lock), 42 42 .me = THIS_MODULE, 43 43 .af = AF_INET6, 44 44 };