The patch titled
net/ipv4/netfilter/nf_nat_rule.c: update rwlock initialization for nat_table
has been removed from the -mm tree. Its filename was
net-ipv4-netfilter-nf_nat_rulec-update-rwlock-initialization-for-nat_table.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: net/ipv4/netfilter/nf_nat_rule.c: update rwlock initialization for nat_table
From: Steven Rostedt <rostedt@xxxxxxxxxxx>
The commit e099a173573ce1ba171092aee7bb3c72ea686e59 (netfilter: netns nat:
per-netns NAT table) renamed the nat_table from __nat_table to nat_table
without updating the __RW_LOCK_UNLOCKED(__nat_table.lock).
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/ipv4/netfilter/nf_nat_rule.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN net/ipv4/netfilter/nf_nat_rule.c~net-ipv4-netfilter-nf_nat_rulec-update-rwlock-initialization-for-nat_table net/ipv4/netfilter/nf_nat_rule.c
--- a/net/ipv4/netfilter/nf_nat_rule.c~net-ipv4-netfilter-nf_nat_rulec-update-rwlock-initialization-for-nat_table
+++ a/net/ipv4/netfilter/nf_nat_rule.c
@@ -61,7 +61,7 @@ static struct
static struct xt_table nat_table = {
.name = "nat",
.valid_hooks = NAT_VALID_HOOKS,
- .lock = __RW_LOCK_UNLOCKED(__nat_table.lock),
+ .lock = __RW_LOCK_UNLOCKED(nat_table.lock),
.me = THIS_MODULE,
.af = AF_INET,
};
_
Patches currently in -mm which might be from rostedt@xxxxxxxxxxx are
linux-next.patch
dvb-remove-deprecated-use-of-rw_lock_unlocked-in-frontends.patch
remove-linux-hardirqh-from-asm-generic-localh-add-include-linux-irqflagsh-to-acpi-processor_idlec.patch
checkpatch-struct-file_operations-should-normally-be-const.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
