diff options
author | Dmitry Mishin <dim@openvz.org> | 2006-04-24 20:18:25 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-04-24 20:27:33 -0400 |
commit | 91536b7ae67710ca888e03ea82c60f0ac073a015 (patch) | |
tree | 84d7cae64287878e9dbfff5ec04e306e50982328 | |
parent | e4a79ef811505a8bf8d8edfda8602e23cb2fbdb0 (diff) |
[NETFILTER]: x_tables: move table->lock initialization
xt_table->lock should be initialized before xt_replace_table() call, which
uses it. This patch removes strict requirement that table should define
lock before registering.
Signed-off-by: Dmitry Mishin <dim@openvz.org>
Signed-off-by: Kirill Korotaev <dev@openvz.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/netfilter/x_tables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 00cf0a4f4d92..17abf60f9570 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c | |||
@@ -529,6 +529,7 @@ int xt_register_table(struct xt_table *table, | |||
529 | 529 | ||
530 | /* Simplifies replace_table code. */ | 530 | /* Simplifies replace_table code. */ |
531 | table->private = bootstrap; | 531 | table->private = bootstrap; |
532 | rwlock_init(&table->lock); | ||
532 | if (!xt_replace_table(table, 0, newinfo, &ret)) | 533 | if (!xt_replace_table(table, 0, newinfo, &ret)) |
533 | goto unlock; | 534 | goto unlock; |
534 | 535 | ||
@@ -538,7 +539,6 @@ int xt_register_table(struct xt_table *table, | |||
538 | /* save number of initial entries */ | 539 | /* save number of initial entries */ |
539 | private->initial_entries = private->number; | 540 | private->initial_entries = private->number; |
540 | 541 | ||
541 | rwlock_init(&table->lock); | ||
542 | list_prepend(&xt[table->af].tables, table); | 542 | list_prepend(&xt[table->af].tables, table); |
543 | 543 | ||
544 | ret = 0; | 544 | ret = 0; |