[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Mark bucket_free_orig_rcu as static

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Mark bucket_free_orig_rcu as static

[Sven Eckelmann]

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/originator.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/batman-adv/originator.c b/batman-adv/originator.c
index 35ab3ab..5a6745f 100644
--- a/batman-adv/originator.c
+++ b/batman-adv/originator.c
@@ -179,7 +179,7 @@ void originator_free(struct bat_priv *bat_priv)
 	hash_destroy(hash);
 }
 
-void bucket_free_orig_rcu(struct rcu_head *rcu)
+static void bucket_free_orig_rcu(struct rcu_head *rcu)
 {
 	struct element_t *bucket;
 	struct orig_node *orig_node;
-- 
1.7.2.3

[B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Silence checkpatch warnings about spinlocks

[Sven Eckelmann]

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 batman-adv/hash.h       |    4 ++--
 batman-adv/originator.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/batman-adv/hash.h b/batman-adv/hash.h
index d47735c..a975e07 100644
--- a/batman-adv/hash.h
+++ b/batman-adv/hash.h
@@ -70,7 +70,7 @@ static inline void hash_delete(struct hashtable_t *hash,
 	struct hlist_head *head;
 	struct hlist_node *walk, *safe;
 	struct element_t *bucket;
-	spinlock_t *list_lock;
+	spinlock_t *list_lock; /* spinlock to protect write access */
 	int i;
 
 	for (i = 0; i < hash->size; i++) {
@@ -100,7 +100,7 @@ static inline int hash_add(struct hashtable_t *hash,
 	struct hlist_head *head;
 	struct hlist_node *walk, *safe;
 	struct element_t *bucket;
-	spinlock_t *list_lock;
+	spinlock_t *list_lock; /* spinlock to protect write access */
 
 	if (!hash)
 		goto err;
diff --git a/batman-adv/originator.c b/batman-adv/originator.c
index 5a6745f..cf2ec37 100644
--- a/batman-adv/originator.c
+++ b/batman-adv/originator.c
@@ -150,7 +150,7 @@ void originator_free(struct bat_priv *bat_priv)
 	struct hlist_node *walk, *safe;
 	struct hlist_head *head;
 	struct element_t *bucket;
-	spinlock_t *list_lock;
+	spinlock_t *list_lock; /* spinlock to protect write access */
 	struct orig_node *orig_node;
 	int i;
 
@@ -353,7 +353,7 @@ static void _purge_orig(struct bat_priv *bat_priv)
 	struct hlist_node *walk, *safe;
 	struct hlist_head *head;
 	struct element_t *bucket;
-	spinlock_t *list_lock;
+	spinlock_t *list_lock; /* spinlock to protect write access */
 	struct orig_node *orig_node;
 	int i;
 
-- 
1.7.2.3

Re: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Mark bucket_free_orig_rcu as static

[Marek Lindner]

On Thursday 20 January 2011 06:22:54 Sven Eckelmann wrote:
> -void bucket_free_orig_rcu(struct rcu_head *rcu)
> +static void bucket_free_orig_rcu(struct rcu_head *rcu)
>  {
>  	struct element_t *bucket;
>  	struct orig_node *orig_node;

Applied in revision 1910.

Thanks,
Marek

Re: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Silence checkpatch warnings about spinlocks

[Marek Lindner]

On Thursday 20 January 2011 06:22:55 Sven Eckelmann wrote:
> @@ -353,7 +353,7 @@ static void _purge_orig(struct bat_priv *bat_priv)
>         struct hlist_node *walk, *safe;
>         struct hlist_head *head;
>         struct element_t *bucket;
> -       spinlock_t *list_lock;
> +       spinlock_t *list_lock; /* spinlock to protect write access */
>         struct orig_node *orig_node;
>         int i;

Applied in version 1911.

Thanks,
Marek