diff options
Diffstat (limited to 'net/tipc/ref.c')
-rw-r--r-- | net/tipc/ref.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/tipc/ref.c b/net/tipc/ref.c index ab8ad32d8c20..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); |