s390/rwlock: add missing local_irq_restore calls

Martin Schwidefsky · Martin Schwidefsky · commit 939c5ae4029e · 2014-05-20T08:58:54.000+02:00
The out of line _raw_read_lock_wait_flags/_raw_write_lock_wait_flags
functions for the arch_read_lock_flags/arch_write_lock_flags  calls
fail to re-enable the interrupts after another unsuccessful try to
get the lock with compare-and-swap. The following wait would be
done with interrupts disabled which is suboptimal.

Signed-off-by: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
@@ -143,6 +143,7 @@ void _raw_read_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)
 		local_irq_disable();
 		if (_raw_compare_and_swap(&rw->lock, old, old + 1))
 			return;
+		local_irq_restore(flags);
 	}
 }
 EXPORT_SYMBOL(_raw_read_lock_wait_flags);
@@ -199,6 +200,7 @@ void _raw_write_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)
 		local_irq_disable();
 		if (_raw_compare_and_swap(&rw->lock, 0, 0x80000000))
 			return;
+		local_irq_restore(flags);
 	}
 }
 EXPORT_SYMBOL(_raw_write_lock_wait_flags);

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ void _raw_read_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)`
`143`	`143`	`local_irq_disable();`
`144`	`144`	`if (_raw_compare_and_swap(&rw->lock, old, old + 1))`
`145`	`145`	`return;`
	`146`	`+ local_irq_restore(flags);`
`146`	`147`	`}`
`147`	`148`	`}`
`148`	`149`	`EXPORT_SYMBOL(_raw_read_lock_wait_flags);`
`@@ -199,6 +200,7 @@ void _raw_write_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)`
`199`	`200`	`local_irq_disable();`
`200`	`201`	`if (_raw_compare_and_swap(&rw->lock, 0, 0x80000000))`
`201`	`202`	`return;`
	`203`	`+ local_irq_restore(flags);`
`202`	`204`	`}`
`203`	`205`	`}`
`204`	`206`	`EXPORT_SYMBOL(_raw_write_lock_wait_flags);`