Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[sfrench/cifs-2.6.git] / net / tipc / subscr.c

diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index ddade7388aa065b1b3a7be8f3c70dc76d31d7283..8c01ccd3626ce6cc26a7da35d748c789e29a0053 100644 (file)
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -1,6 +1,6 @@
 /*
  * net/tipc/subscr.c: TIPC subscription service
- * 
+ *
  * Copyright (c) 2000-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
@@ -49,10 +49,10 @@
  * @port_ref: object reference to port used to communicate with subscriber
  * @swap: indicates if subscriber uses opposite endianness in its messages
  */
- 
+
 struct subscriber {
        u32 ref;
-        spinlock_t *lock;
+       spinlock_t *lock;
        struct list_head subscriber_list;
        struct list_head subscription_list;
        u32 port_ref;
@@ -82,7 +82,7 @@ static struct top_srv topsrv = { 0 };
  * htohl - convert value to endianness used by destination
  * @in: value to convert
  * @swap: non-zero if endianness must be reversed
- * 
+ *
  * Returns converted value
  */
 
@@ -97,11 +97,11 @@ static u32 htohl(u32 in, int swap)
  * subscr_send_event - send a message containing a tipc_event to the subscriber
  */
 
-static void subscr_send_event(struct subscription *sub, 
-                             u32 found_lower, 
+static void subscr_send_event(struct subscription *sub,
+                             u32 found_lower,
                              u32 found_upper,
-                             u32 event, 
-                             u32 port_ref, 
+                             u32 event,
+                             u32 port_ref,
                              u32 node)
 {
        struct iovec msg_sect;
@@ -123,8 +123,8 @@ static void subscr_send_event(struct subscription *sub,
  * Returns 1 if there is overlap, otherwise 0.
  */
 
-int tipc_subscr_overlap(struct subscription *sub, 
-                       u32 found_lower, 
+int tipc_subscr_overlap(struct subscription *sub,
+                       u32 found_lower,
                        u32 found_upper)
 
 {
@@ -139,15 +139,15 @@ int tipc_subscr_overlap(struct subscription *sub,
 
 /**
  * tipc_subscr_report_overlap - issue event if there is subscription overlap
- * 
+ *
  * Protected by nameseq.lock in name_table.c
  */
 
-void tipc_subscr_report_overlap(struct subscription *sub, 
-                               u32 found_lower, 
+void tipc_subscr_report_overlap(struct subscription *sub,
+                               u32 found_lower,
                                u32 found_upper,
-                               u32 event, 
-                               u32 port_ref, 
+                               u32 event,
+                               u32 port_ref,
                                u32 node,
                                int must)
 {
@@ -189,11 +189,11 @@ static void subscr_timeout(struct subscription *sub)
 
        /* Notify subscriber of timeout, then unlink subscription */
 
-       subscr_send_event(sub, 
-                         sub->evt.s.seq.lower, 
+       subscr_send_event(sub,
+                         sub->evt.s.seq.lower,
                          sub->evt.s.seq.upper,
-                         TIPC_SUBSCR_TIMEOUT, 
-                         0, 
+                         TIPC_SUBSCR_TIMEOUT,
+                         0,
                          0);
        list_del(&sub->subscription_list);
 
@@ -221,11 +221,11 @@ static void subscr_del(struct subscription *sub)
 
 /**
  * subscr_terminate - terminate communication with a subscriber
- * 
+ *
  * Called with subscriber locked.  Routine must temporarily release this lock
- * to enable subscription timeout routine(s) to finish without deadlocking; 
+ * to enable subscription timeout routine(s) to finish without deadlocking;
  * the lock is then reclaimed to allow caller to release it upon return.
- * (This should work even in the unlikely event some other thread creates 
+ * (This should work even in the unlikely event some other thread creates
  * a new object reference in the interim that uses this lock; this routine will
  * simply wait for it to be released, then claim it.)
  */
@@ -241,7 +241,7 @@ static void subscr_terminate(struct subscriber *subscriber)
        spin_unlock_bh(subscriber->lock);
 
        /* Destroy any existing subscriptions for subscriber */
-       
+
        list_for_each_entry_safe(sub, sub_temp, &subscriber->subscription_list,
                                 subscription_list) {
                if (sub->timeout != TIPC_WAIT_FOREVER) {
@@ -315,7 +315,7 @@ static void subscr_cancel(struct tipc_subscr *s,
 
 /**
  * subscr_subscribe - create subscription for subscriber
- * 
+ *
  * Called with subscriber locked
  */
 
@@ -431,7 +431,7 @@ static void subscr_conn_msg_event(void *usr_handle,
                subscr_terminate(subscriber);
        else
                subscr_subscribe((struct tipc_subscr *)data, subscriber);
-       
+
        spin_unlock_bh(subscriber_lock);
 }
 
@@ -444,7 +444,7 @@ static void subscr_named_msg_event(void *usr_handle,
                                   struct sk_buff **buf,
                                   const unchar *data,
                                   u32 size,
-                                  u32 importance, 
+                                  u32 importance,
                                   struct tipc_portid const *orig,
                                   struct tipc_name_seq const *dest)
 {
@@ -534,22 +534,22 @@ int tipc_subscr_start(void)
                return res;
        }
 
-       res = tipc_createport(topsrv.user_ref,
-                             NULL,
-                             TIPC_CRITICAL_IMPORTANCE,
-                             NULL,
-                             NULL,
-                             NULL,
-                             NULL,
-                             subscr_named_msg_event,
-                             NULL,
-                             NULL,
-                             &topsrv.setup_port);
-       if (res)
+       res = tipc_createport(topsrv.user_ref,
+                             NULL,
+                             TIPC_CRITICAL_IMPORTANCE,
+                             NULL,
+                             NULL,
+                             NULL,
+                             NULL,
+                             subscr_named_msg_event,
+                             NULL,
+                             NULL,
+                             &topsrv.setup_port);
+       if (res)
                goto failed;
 
-       res = tipc_nametbl_publish_rsv(topsrv.setup_port, TIPC_NODE_SCOPE, &seq);
-       if (res)
+       res = tipc_nametbl_publish_rsv(topsrv.setup_port, TIPC_NODE_SCOPE, &seq);
+       if (res)
                goto failed;
 
        spin_unlock_bh(&topsrv.lock);
@@ -571,7 +571,7 @@ void tipc_subscr_stop(void)
 
        if (topsrv.user_ref) {
                tipc_deleteport(topsrv.setup_port);
-               list_for_each_entry_safe(subscriber, subscriber_temp, 
+               list_for_each_entry_safe(subscriber, subscriber_temp,
                                         &topsrv.subscriber_list,
                                         subscriber_list) {
                        tipc_ref_lock(subscriber->ref);