ocfs2_dlm: Fix lockres ref counting bug

[linux-2.6] / net / bridge / br_stp.c

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 04ca0639a95a71d52ac7b2ae3a0a48f7a34f9cf6..f9ff4d57b0d7fc60cbbd5e5718f2e67c0b247121 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -24,17 +24,17 @@
 #define MESSAGE_AGE_INCR       ((HZ < 256) ? 1 : (HZ/256))
 
 static const char *br_port_state_names[] = {
-       [BR_STATE_DISABLED] = "disabled", 
+       [BR_STATE_DISABLED] = "disabled",
        [BR_STATE_LISTENING] = "listening",
-       [BR_STATE_LEARNING] = "learning", 
-       [BR_STATE_FORWARDING] = "forwarding", 
+       [BR_STATE_LEARNING] = "learning",
+       [BR_STATE_FORWARDING] = "forwarding",
        [BR_STATE_BLOCKING] = "blocking",
 };
 
 void br_log_state(const struct net_bridge_port *p)
 {
        pr_info("%s: port %d(%s) entering %s state\n",
-               p->br->dev->name, p->port_no, p->dev->name, 
+               p->br->dev->name, p->port_no, p->dev->name,
                br_port_state_names[p->state]);
 
 }
@@ -53,7 +53,7 @@ struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no)
 }
 
 /* called under bridge lock */
-static int br_should_become_root_port(const struct net_bridge_port *p, 
+static int br_should_become_root_port(const struct net_bridge_port *p,
                                      u16 root_port)
 {
        struct net_bridge *br;
@@ -184,7 +184,7 @@ void br_transmit_config(struct net_bridge_port *p)
 }
 
 /* called under bridge lock */
-static inline void br_record_config_information(struct net_bridge_port *p, 
+static inline void br_record_config_information(struct net_bridge_port *p,
                                                const struct br_config_bpdu *bpdu)
 {
        p->designated_root = bpdu->root;
@@ -192,12 +192,12 @@ static inline void br_record_config_information(struct net_bridge_port *p,
        p->designated_bridge = bpdu->bridge_id;
        p->designated_port = bpdu->port_id;
 
-       mod_timer(&p->message_age_timer, jiffies 
+       mod_timer(&p->message_age_timer, jiffies
                  + (p->br->max_age - bpdu->message_age));
 }
 
 /* called under bridge lock */
-static inline void br_record_config_timeout_values(struct net_bridge *br, 
+static inline void br_record_config_timeout_values(struct net_bridge *br,
                                            const struct br_config_bpdu *bpdu)
 {
        br->max_age = bpdu->max_age;
@@ -415,7 +415,7 @@ void br_received_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *b
 {
        struct net_bridge *br;
        int was_root;
- 
+
        br = p->br;
        was_root = br_is_root_bridge(br);
 
@@ -430,7 +430,7 @@ void br_received_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *b
                                del_timer(&br->topology_change_timer);
                                br_transmit_tcn(br);
 
-                               mod_timer(&br->tcn_timer, 
+                               mod_timer(&br->tcn_timer,
                                          jiffies + br->bridge_hello_time);
                        }
                }
@@ -441,8 +441,8 @@ void br_received_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *b
                        if (bpdu->topology_change_ack)
                                br_topology_change_acknowledged(br);
                }
-       } else if (br_is_designated_port(p)) {          
-               br_reply(p);            
+       } else if (br_is_designated_port(p)) {
+               br_reply(p);
        }
 }