114 lines
3.2 KiB
Diff
114 lines
3.2 KiB
Diff
From 534f9a4f05a4c9a53245b93eb3db2e4fe1d48307 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <534f9a4f05a4c9a53245b93eb3db2e4fe1d48307.1601675151.git.zanussi@kernel.org>
|
|
In-Reply-To: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
References: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Fri, 18 Mar 2011 10:11:25 +0100
|
|
Subject: [PATCH 067/333] fs: jbd/jbd2: Make state lock and journal head lock
|
|
rt safe
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.148-rt64.tar.xz
|
|
|
|
bit_spin_locks break under RT.
|
|
|
|
Based on a previous patch from Steven Rostedt <rostedt@goodmis.org>
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
--
|
|
include/linux/buffer_head.h | 8 ++++++++
|
|
include/linux/jbd2.h | 24 ++++++++++++++++++++++++
|
|
2 files changed, 32 insertions(+)
|
|
---
|
|
include/linux/buffer_head.h | 8 ++++++++
|
|
include/linux/jbd2.h | 24 ++++++++++++++++++++++++
|
|
2 files changed, 32 insertions(+)
|
|
|
|
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
|
|
index 572541d6cc90..703bf3335a3d 100644
|
|
--- a/include/linux/buffer_head.h
|
|
+++ b/include/linux/buffer_head.h
|
|
@@ -78,6 +78,10 @@ struct buffer_head {
|
|
atomic_t b_count; /* users using this buffer_head */
|
|
#ifdef CONFIG_PREEMPT_RT_BASE
|
|
spinlock_t b_uptodate_lock;
|
|
+#if IS_ENABLED(CONFIG_JBD2)
|
|
+ spinlock_t b_state_lock;
|
|
+ spinlock_t b_journal_head_lock;
|
|
+#endif
|
|
#endif
|
|
};
|
|
|
|
@@ -109,6 +113,10 @@ static inline void buffer_head_init_locks(struct buffer_head *bh)
|
|
{
|
|
#ifdef CONFIG_PREEMPT_RT_BASE
|
|
spin_lock_init(&bh->b_uptodate_lock);
|
|
+#if IS_ENABLED(CONFIG_JBD2)
|
|
+ spin_lock_init(&bh->b_state_lock);
|
|
+ spin_lock_init(&bh->b_journal_head_lock);
|
|
+#endif
|
|
#endif
|
|
}
|
|
|
|
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
|
|
index 268f3000d1b3..8f5d6ecb802e 100644
|
|
--- a/include/linux/jbd2.h
|
|
+++ b/include/linux/jbd2.h
|
|
@@ -347,32 +347,56 @@ static inline struct journal_head *bh2jh(struct buffer_head *bh)
|
|
|
|
static inline void jbd_lock_bh_state(struct buffer_head *bh)
|
|
{
|
|
+#ifndef CONFIG_PREEMPT_RT_BASE
|
|
bit_spin_lock(BH_State, &bh->b_state);
|
|
+#else
|
|
+ spin_lock(&bh->b_state_lock);
|
|
+#endif
|
|
}
|
|
|
|
static inline int jbd_trylock_bh_state(struct buffer_head *bh)
|
|
{
|
|
+#ifndef CONFIG_PREEMPT_RT_BASE
|
|
return bit_spin_trylock(BH_State, &bh->b_state);
|
|
+#else
|
|
+ return spin_trylock(&bh->b_state_lock);
|
|
+#endif
|
|
}
|
|
|
|
static inline int jbd_is_locked_bh_state(struct buffer_head *bh)
|
|
{
|
|
+#ifndef CONFIG_PREEMPT_RT_BASE
|
|
return bit_spin_is_locked(BH_State, &bh->b_state);
|
|
+#else
|
|
+ return spin_is_locked(&bh->b_state_lock);
|
|
+#endif
|
|
}
|
|
|
|
static inline void jbd_unlock_bh_state(struct buffer_head *bh)
|
|
{
|
|
+#ifndef CONFIG_PREEMPT_RT_BASE
|
|
bit_spin_unlock(BH_State, &bh->b_state);
|
|
+#else
|
|
+ spin_unlock(&bh->b_state_lock);
|
|
+#endif
|
|
}
|
|
|
|
static inline void jbd_lock_bh_journal_head(struct buffer_head *bh)
|
|
{
|
|
+#ifndef CONFIG_PREEMPT_RT_BASE
|
|
bit_spin_lock(BH_JournalHead, &bh->b_state);
|
|
+#else
|
|
+ spin_lock(&bh->b_journal_head_lock);
|
|
+#endif
|
|
}
|
|
|
|
static inline void jbd_unlock_bh_journal_head(struct buffer_head *bh)
|
|
{
|
|
+#ifndef CONFIG_PREEMPT_RT_BASE
|
|
bit_spin_unlock(BH_JournalHead, &bh->b_state);
|
|
+#else
|
|
+ spin_unlock(&bh->b_journal_head_lock);
|
|
+#endif
|
|
}
|
|
|
|
#define J_ASSERT(assert) BUG_ON(!(assert))
|
|
--
|
|
2.17.1
|
|
|