diff options
Diffstat (limited to 'net/tipc/ref.c')
-rw-r--r-- | net/tipc/ref.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/net/tipc/ref.c b/net/tipc/ref.c index 8dea66500cf5..83116892528b 100644 --- a/net/tipc/ref.c +++ b/net/tipc/ref.c | |||
@@ -89,7 +89,7 @@ struct ref_table { | |||
89 | * have a reference value of 0 (although this is unlikely). | 89 | * have a reference value of 0 (although this is unlikely). |
90 | */ | 90 | */ |
91 | 91 | ||
92 | static struct ref_table tipc_ref_table = { NULL }; | 92 | static struct ref_table tipc_ref_table; |
93 | 93 | ||
94 | static DEFINE_RWLOCK(ref_table_lock); | 94 | static DEFINE_RWLOCK(ref_table_lock); |
95 | 95 | ||
@@ -178,14 +178,12 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock) | |||
178 | next_plus_upper = entry->ref; | 178 | next_plus_upper = entry->ref; |
179 | tipc_ref_table.first_free = next_plus_upper & index_mask; | 179 | tipc_ref_table.first_free = next_plus_upper & index_mask; |
180 | ref = (next_plus_upper & ~index_mask) + index; | 180 | ref = (next_plus_upper & ~index_mask) + index; |
181 | } | 181 | } else if (tipc_ref_table.init_point < tipc_ref_table.capacity) { |
182 | else if (tipc_ref_table.init_point < tipc_ref_table.capacity) { | ||
183 | index = tipc_ref_table.init_point++; | 182 | index = tipc_ref_table.init_point++; |
184 | entry = &(tipc_ref_table.entries[index]); | 183 | entry = &(tipc_ref_table.entries[index]); |
185 | spin_lock_init(&entry->lock); | 184 | spin_lock_init(&entry->lock); |
186 | ref = tipc_ref_table.start_mask + index; | 185 | ref = tipc_ref_table.start_mask + index; |
187 | } | 186 | } else { |
188 | else { | ||
189 | ref = 0; | 187 | ref = 0; |
190 | } | 188 | } |
191 | write_unlock_bh(&ref_table_lock); | 189 | write_unlock_bh(&ref_table_lock); |
@@ -282,23 +280,6 @@ void *tipc_ref_lock(u32 ref) | |||
282 | return NULL; | 280 | return NULL; |
283 | } | 281 | } |
284 | 282 | ||
285 | /** | ||
286 | * tipc_ref_unlock - unlock referenced object | ||
287 | */ | ||
288 | |||
289 | void tipc_ref_unlock(u32 ref) | ||
290 | { | ||
291 | if (likely(tipc_ref_table.entries)) { | ||
292 | struct reference *entry; | ||
293 | |||
294 | entry = &tipc_ref_table.entries[ref & | ||
295 | tipc_ref_table.index_mask]; | ||
296 | if (likely((entry->ref == ref) && (entry->object))) | ||
297 | spin_unlock_bh(&entry->lock); | ||
298 | else | ||
299 | err("Attempt to unlock non-existent reference\n"); | ||
300 | } | ||
301 | } | ||
302 | 283 | ||
303 | /** | 284 | /** |
304 | * tipc_ref_deref - return pointer referenced object (without locking it) | 285 | * tipc_ref_deref - return pointer referenced object (without locking it) |