1 files changed, 5 insertions, 25 deletions

diff --git a/net/tipc/ref.c b/net/tipc/ref.c
index 2a2a938dc22c..3d4ecd754eee 100644
--- a/net/tipc/ref.c
+++ b/net/tipc/ref.c
@@ -89,7 +89,7 @@ struct ref_table {
 
 static struct ref_table tipc_ref_table;
 
-static DEFINE_RWLOCK(ref_table_lock);
+static DEFINE_SPINLOCK(ref_table_lock);
 
 /**
  * tipc_ref_table_init - create reference table for objects
@@ -126,9 +126,6 @@ int tipc_ref_table_init(u32 requested_size, u32 start)
  */
 void tipc_ref_table_stop(void)
 {
-        if (!tipc_ref_table.entries)
-                return;
-
         vfree(tipc_ref_table.entries);
         tipc_ref_table.entries = NULL;
 }
@@ -162,7 +159,7 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock)
         }
 
         /* take a free entry, if available; otherwise initialize a new entry */
-        write_lock_bh(&ref_table_lock);
+        spin_lock_bh(&ref_table_lock);
         if (tipc_ref_table.first_free) {
                 index = tipc_ref_table.first_free;
                 entry = &(tipc_ref_table.entries[index]);
@@ -178,7 +175,7 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock)
         } else {
                 ref = 0;
         }
-        write_unlock_bh(&ref_table_lock);
+        spin_unlock_bh(&ref_table_lock);
 
         /*
          * Grab the lock so no one else can modify this entry
@@ -219,7 +216,7 @@ void tipc_ref_discard(u32 ref)
         index = ref & index_mask;
         entry = &(tipc_ref_table.entries[index]);
 
-        write_lock_bh(&ref_table_lock);
+        spin_lock_bh(&ref_table_lock);
 
         if (!entry->object) {
                 pr_err("Attempt to discard ref. to non-existent obj\n");
@@ -245,7 +242,7 @@ void tipc_ref_discard(u32 ref)
         tipc_ref_table.last_free = index;
 
 exit:
-        write_unlock_bh(&ref_table_lock);
+        spin_unlock_bh(&ref_table_lock);
 }
 
 /**
@@ -267,20 +264,3 @@ void *tipc_ref_lock(u32 ref)
         }
         return NULL;
 }
-
-
-/**
- * tipc_ref_deref - return pointer referenced object (without locking it)
- */
-void *tipc_ref_deref(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))
-                        return entry->object;
-        }
-        return NULL;
-}