[NETFILTER]: nf_log: switch logger registration/unregistration to mutex

[pandora-kernel.git] / net / netfilter / nf_log.c

diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index 3e76bd0..243d66b 100644 (file)
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -16,44 +15,45 @@
 #define NF_LOG_PREFIXLEN               128
 
 static struct nf_logger *nf_logging[NPROTO]; /* = NULL */
-static DEFINE_SPINLOCK(nf_log_lock);
+static DEFINE_MUTEX(nf_log_mutex);
 
 /* return EBUSY if somebody else is registered, EEXIST if the same logger
  * is registred, 0 on success. */
 int nf_log_register(int pf, struct nf_logger *logger)
 {
-       int ret = -EBUSY;
+       int ret;
 
        if (pf >= NPROTO)
                return -EINVAL;
 
        /* Any setup of logging members must be done before
         * substituting pointer. */
-       spin_lock(&nf_log_lock);
-       if (!nf_logging[pf]) {
+       ret = mutex_lock_interruptible(&nf_log_mutex);
+       if (ret < 0)
+               return ret;
+
+       if (!nf_logging[pf])
                rcu_assign_pointer(nf_logging[pf], logger);
-               ret = 0;
-       } else if (nf_logging[pf] == logger)
+       else if (nf_logging[pf] == logger)
                ret = -EEXIST;
+       else
+               ret = -EBUSY;
 
-       spin_unlock(&nf_log_lock);
+       mutex_unlock(&nf_log_mutex);
        return ret;
 }              
 EXPORT_SYMBOL(nf_log_register);
 
-int nf_log_unregister_pf(int pf)
+void nf_log_unregister_pf(int pf)
 {
        if (pf >= NPROTO)
-               return -EINVAL;
-
-       spin_lock(&nf_log_lock);
-       nf_logging[pf] = NULL;
-       spin_unlock(&nf_log_lock);
+               return;
+       mutex_lock(&nf_log_mutex);
+       rcu_assign_pointer(nf_logging[pf], NULL);
+       mutex_unlock(&nf_log_mutex);
 
        /* Give time to concurrent readers. */
-       synchronize_net();
-
-       return 0;
+       synchronize_rcu();
 }
 EXPORT_SYMBOL(nf_log_unregister_pf);
 
@@ -61,14 +61,14 @@ void nf_log_unregister_logger(struct nf_logger *logger)
 {
        int i;
 
-       spin_lock(&nf_log_lock);
+       mutex_lock(&nf_log_mutex);
        for (i = 0; i < NPROTO; i++) {
                if (nf_logging[i] == logger)
-                       nf_logging[i] = NULL;
+                       rcu_assign_pointer(nf_logging[i], NULL);
        }
-       spin_unlock(&nf_log_lock);
+       mutex_unlock(&nf_log_mutex);
 
-       synchronize_net();
+       synchronize_rcu();
 }
 EXPORT_SYMBOL(nf_log_unregister_logger);
 
@@ -152,7 +152,7 @@ static int nflog_open(struct inode *inode, struct file *file)
        return seq_open(file, &nflog_seq_ops);
 }
 
-static struct file_operations nflog_file_ops = {
+static const struct file_operations nflog_file_ops = {
        .owner   = THIS_MODULE,
        .open    = nflog_open,
        .read    = seq_read,