summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch')
-rw-r--r--debian/patches-rt/locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch b/debian/patches-rt/locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch
index c6af5f5ff..4ef80a2f9 100644
--- a/debian/patches-rt/locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch
+++ b/debian/patches-rt/locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch
@@ -1,7 +1,7 @@
From: Mikulas Patocka <mpatocka@redhat.com>
Date: Mon, 13 Nov 2017 12:56:53 -0500
Subject: [PATCH] locking/rt-mutex: fix deadlock in device mapper / block-IO
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.0/older/patches-5.0.10-rt7.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2-rt1.tar.xz
When some block device driver creates a bio and submits it to another
block device driver, the bio is added to current->bio_list (in order to
@@ -38,7 +38,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
-@@ -24,6 +24,7 @@
+@@ -25,6 +25,7 @@
#include <linux/sched/debug.h>
#include <linux/timer.h>
#include <linux/ww_mutex.h>
@@ -46,7 +46,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
#include "rtmutex_common.h"
-@@ -1919,6 +1920,15 @@ rt_mutex_fastlock(struct rt_mutex *lock,
+@@ -1895,6 +1896,15 @@ rt_mutex_fastlock(struct rt_mutex *lock,
if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
return 0;
@@ -62,7 +62,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK, ww_ctx);
}
-@@ -1936,6 +1946,9 @@ rt_mutex_timed_fastlock(struct rt_mutex
+@@ -1912,6 +1922,9 @@ rt_mutex_timed_fastlock(struct rt_mutex
likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
return 0;