Skip to content

Commit

Permalink
[NETFILTER] x_table.c: sem2mutex
Browse files Browse the repository at this point in the history 
Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ingo Molnar authored and David S. Miller committed Mar 25, 2006
1 parent cef2685 commit 9e19bb6
Showing 1 changed file with 29 additions and 27 deletions.
56 changes: 29 additions & 27 deletions net/netfilter/x_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,20 @@
#include <linux/seq_file.h>
#include <linux/string.h>
#include <linux/vmalloc.h>
#include <linux/mutex.h>

#include <linux/netfilter/x_tables.h>
#include <linux/netfilter_arp.h>


MODULE_LICENSE("GPL");
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("[ip,ip6,arp]_tables backend module");

#define SMP_ALIGN(x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1))

struct xt_af {
struct semaphore mutex;
struct mutex mutex;
struct list_head match;
struct list_head target;
struct list_head tables;
Expand Down Expand Up @@ -64,11 +66,11 @@ xt_register_target(struct xt_target *target)
{
int ret, af = target->family;

ret = down_interruptible(&xt[af].mutex);
ret = mutex_lock_interruptible(&xt[af].mutex);
if (ret != 0)
return ret;
list_add(&target->list, &xt[af].target);
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);
return ret;
}
EXPORT_SYMBOL(xt_register_target);
Expand All @@ -78,9 +80,9 @@ xt_unregister_target(struct xt_target *target)
{
int af = target->family;

down(&xt[af].mutex);
mutex_lock(&xt[af].mutex);
LIST_DELETE(&xt[af].target, target);
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);
}
EXPORT_SYMBOL(xt_unregister_target);

Expand All @@ -89,12 +91,12 @@ xt_register_match(struct xt_match *match)
{
int ret, af = match->family;

ret = down_interruptible(&xt[af].mutex);
ret = mutex_lock_interruptible(&xt[af].mutex);
if (ret != 0)
return ret;

list_add(&match->list, &xt[af].match);
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);

return ret;
}
Expand All @@ -105,9 +107,9 @@ xt_unregister_match(struct xt_match *match)
{
int af = match->family;

down(&xt[af].mutex);
mutex_lock(&xt[af].mutex);
LIST_DELETE(&xt[af].match, match);
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);
}
EXPORT_SYMBOL(xt_unregister_match);

Expand All @@ -124,21 +126,21 @@ struct xt_match *xt_find_match(int af, const char *name, u8 revision)
struct xt_match *m;
int err = 0;

if (down_interruptible(&xt[af].mutex) != 0)
if (mutex_lock_interruptible(&xt[af].mutex) != 0)
return ERR_PTR(-EINTR);

list_for_each_entry(m, &xt[af].match, list) {
if (strcmp(m->name, name) == 0) {
if (m->revision == revision) {
if (try_module_get(m->me)) {
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);
return m;
}
} else
err = -EPROTOTYPE; /* Found something. */
}
}
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);
return ERR_PTR(err);
}
EXPORT_SYMBOL(xt_find_match);
Expand All @@ -149,21 +151,21 @@ struct xt_target *xt_find_target(int af, const char *name, u8 revision)
struct xt_target *t;
int err = 0;

if (down_interruptible(&xt[af].mutex) != 0)
if (mutex_lock_interruptible(&xt[af].mutex) != 0)
return ERR_PTR(-EINTR);

list_for_each_entry(t, &xt[af].target, list) {
if (strcmp(t->name, name) == 0) {
if (t->revision == revision) {
if (try_module_get(t->me)) {
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);
return t;
}
} else
err = -EPROTOTYPE; /* Found something. */
}
}
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);
return ERR_PTR(err);
}
EXPORT_SYMBOL(xt_find_target);
Expand Down Expand Up @@ -218,15 +220,15 @@ int xt_find_revision(int af, const char *name, u8 revision, int target,
{
int have_rev, best = -1;

if (down_interruptible(&xt[af].mutex) != 0) {
if (mutex_lock_interruptible(&xt[af].mutex) != 0) {
*err = -EINTR;
return 1;
}
if (target == 1)
have_rev = target_revfn(af, name, revision, &best);
else
have_rev = match_revfn(af, name, revision, &best);
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);

/* Nothing at all? Return 0 to try loading module. */
if (best == -1) {
Expand Down Expand Up @@ -352,20 +354,20 @@ struct xt_table *xt_find_table_lock(int af, const char *name)
{
struct xt_table *t;

if (down_interruptible(&xt[af].mutex) != 0)
if (mutex_lock_interruptible(&xt[af].mutex) != 0)
return ERR_PTR(-EINTR);

list_for_each_entry(t, &xt[af].tables, list)
if (strcmp(t->name, name) == 0 && try_module_get(t->me))
return t;
up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);
return NULL;
}
EXPORT_SYMBOL_GPL(xt_find_table_lock);

void xt_table_unlock(struct xt_table *table)
{
up(&xt[table->af].mutex);
mutex_unlock(&xt[table->af].mutex);
}
EXPORT_SYMBOL_GPL(xt_table_unlock);

Expand Down Expand Up @@ -405,7 +407,7 @@ int xt_register_table(struct xt_table *table,
int ret;
struct xt_table_info *private;

ret = down_interruptible(&xt[table->af].mutex);
ret = mutex_lock_interruptible(&xt[table->af].mutex);
if (ret != 0)
return ret;

Expand All @@ -431,7 +433,7 @@ int xt_register_table(struct xt_table *table,

ret = 0;
unlock:
up(&xt[table->af].mutex);
mutex_unlock(&xt[table->af].mutex);
return ret;
}
EXPORT_SYMBOL_GPL(xt_register_table);
Expand All @@ -440,10 +442,10 @@ void *xt_unregister_table(struct xt_table *table)
{
struct xt_table_info *private;

down(&xt[table->af].mutex);
mutex_lock(&xt[table->af].mutex);
private = table->private;
LIST_DELETE(&xt[table->af].tables, table);
up(&xt[table->af].mutex);
mutex_unlock(&xt[table->af].mutex);

return private;
}
Expand Down Expand Up @@ -507,7 +509,7 @@ static void *xt_tgt_seq_start(struct seq_file *seq, loff_t *pos)
if (!list)
return NULL;

if (down_interruptible(&xt[af].mutex) != 0)
if (mutex_lock_interruptible(&xt[af].mutex) != 0)
return NULL;

return xt_get_idx(list, seq, *pos);
Expand Down Expand Up @@ -536,7 +538,7 @@ static void xt_tgt_seq_stop(struct seq_file *seq, void *v)
struct proc_dir_entry *pde = seq->private;
u_int16_t af = (unsigned long)pde->data & 0xffff;

up(&xt[af].mutex);
mutex_unlock(&xt[af].mutex);
}

static int xt_name_seq_show(struct seq_file *seq, void *v)
Expand Down Expand Up @@ -668,7 +670,7 @@ static int __init xt_init(void)
return -ENOMEM;

for (i = 0; i < NPROTO; i++) {
init_MUTEX(&xt[i].mutex);
mutex_init(&xt[i].mutex);
INIT_LIST_HEAD(&xt[i].target);
INIT_LIST_HEAD(&xt[i].match);
INIT_LIST_HEAD(&xt[i].tables);
Expand Down

0 comments on commit 9e19bb6

Please sign in to comment.