From: Alexey Kodanev <alexey.kodanev@oracle.com>
Date: Sat, 7 Mar 2015 00:06:53 +0000 (+0300)
Subject: locktorture: fix deadlock in 'rw_lock_irq' type
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~6463^2^2^7~12
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f548d99ef4f5ec8f7080e88ad07c44d16d058ddc;hp=7d0ae8086b828311250c6afdf800b568ac9bd693;p=mirror_ubuntu-zesty-kernel.git

locktorture: fix deadlock in 'rw_lock_irq' type

torture_rwlock_read_unlock_irq() must use read_unlock_irqrestore()
instead of write_unlock_irqrestore().

Use read_unlock_irqrestore() instead of write_unlock_irqrestore().

Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
---

diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
index ec8cce259779..6a2723c88c33 100644
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@ -309,7 +309,7 @@ static int torture_rwlock_read_lock_irq(void) __acquires(torture_rwlock)
 static void torture_rwlock_read_unlock_irq(void)
 __releases(torture_rwlock)
 {
-	write_unlock_irqrestore(&torture_rwlock, cxt.cur_ops->flags);
+	read_unlock_irqrestore(&torture_rwlock, cxt.cur_ops->flags);
 }
 
 static struct lock_torture_ops rw_lock_irq_ops = {