patch-2.4.6 linux/lib/brlock.c

• Lines: 35
• Date: Fri Jun 29 19:38:26 2001
• Orig file: v2.4.5/linux/lib/brlock.c
• Orig date: Mon Apr 24 13:59:56 2000

diff -u --recursive --new-file v2.4.5/linux/lib/brlock.c linux/lib/brlock.c
@@ -25,7 +25,7 @@
 	int i;
 
 	for (i = 0; i < smp_num_cpus; i++)
-		write_lock(__brlock_array[idx] + cpu_logical_map(i));
+		write_lock(&__brlock_array[cpu_logical_map(i)][idx]);
 }
 
 void __br_write_unlock (enum brlock_indices idx)
@@ -33,7 +33,7 @@
 	int i;
 
 	for (i = 0; i < smp_num_cpus; i++)
-		write_unlock(__brlock_array[idx] + cpu_logical_map(i));
+		write_unlock(&__brlock_array[cpu_logical_map(i)][idx]);
 }
 
 #else /* ! __BRLOCK_USE_ATOMICS */
@@ -48,11 +48,14 @@
 {
 	int i;
 
-	spin_lock(&__br_write_locks[idx].lock);
 again:
+	spin_lock(&__br_write_locks[idx].lock);
 	for (i = 0; i < smp_num_cpus; i++)
-		if (__brlock_array[cpu_logical_map(i)][idx] != 0)
+		if (__brlock_array[cpu_logical_map(i)][idx] != 0) {
+			spin_unlock(&__br_write_locks[idx].lock);
+			barrier();
 			goto again;
+		}
 }
 
 void __br_write_unlock (enum brlock_indices idx)