Merge branch 'master' into tk71

[mv-sheeva.git] / net / tipc / ref.c

diff --git a/net/tipc/ref.c b/net/tipc/ref.c
index 8dea66500cf5ce65d6427aad77152f437e0c92ac..83116892528b448c0097ca3ae432e16995db8810 100644 (file)
--- a/net/tipc/ref.c
+++ b/net/tipc/ref.c
@@ -89,7 +89,7 @@ struct ref_table {
  * have a reference value of 0 (although this is unlikely).
  */
 
-static struct ref_table tipc_ref_table = { NULL };
+static struct ref_table tipc_ref_table;
 
 static DEFINE_RWLOCK(ref_table_lock);
 
@@ -178,14 +178,12 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock)
                next_plus_upper = entry->ref;
                tipc_ref_table.first_free = next_plus_upper & index_mask;
                ref = (next_plus_upper & ~index_mask) + index;
-       }
-       else if (tipc_ref_table.init_point < tipc_ref_table.capacity) {
+       } else if (tipc_ref_table.init_point < tipc_ref_table.capacity) {
                index = tipc_ref_table.init_point++;
                entry = &(tipc_ref_table.entries[index]);
                spin_lock_init(&entry->lock);
                ref = tipc_ref_table.start_mask + index;
-       }
-       else {
+       } else {
                ref = 0;
        }
        write_unlock_bh(&ref_table_lock);
@@ -282,23 +280,6 @@ void *tipc_ref_lock(u32 ref)
        return NULL;
 }
 
-/**
- * tipc_ref_unlock - unlock referenced object
- */
-
-void tipc_ref_unlock(u32 ref)
-{
-       if (likely(tipc_ref_table.entries)) {
-               struct reference *entry;
-
-               entry = &tipc_ref_table.entries[ref &
-                                               tipc_ref_table.index_mask];
-               if (likely((entry->ref == ref) && (entry->object)))
-                       spin_unlock_bh(&entry->lock);
-               else
-                       err("Attempt to unlock non-existent reference\n");
-       }
-}
 
 /**
  * tipc_ref_deref - return pointer referenced object (without locking it)