blob: 03415d1bd8d1213d2492ad7f38726d28eeb761a1 [file] [log] [blame]
From 6772ca45ec38d1bb90b6071a3df1d8b0a7ab1f27 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 3 Jul 2009 08:30:28 -0500
Subject: [PATCH] fs: btrfs locking workaround for preempt -rt
commit 6772ca45ec38d1bb90b6071a3df1d8b0a7ab1f27 in tip.
- btrfs_path_lock_waiting() looks rather dubious and there's no
spin_is_contended() method on PREEMPT_RT - so exclude this for now
=> needs a proper fix later. Either this code gets zapped from btrfs
upstream, or we add spin_is_contended() to PREEMPT_RT too.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
index 1c36e5c..4b3d18a 100644
--- a/fs/btrfs/locking.c
+++ b/fs/btrfs/locking.c
@@ -94,6 +94,7 @@ static int btrfs_spin_on_block(struct extent_buffer *eb)
*/
int btrfs_try_spin_lock(struct extent_buffer *eb)
{
+#ifndef CONFIG_PREEMPT_RT
int i;
if (btrfs_spin_on_block(eb)) {
@@ -113,6 +114,7 @@ int btrfs_try_spin_lock(struct extent_buffer *eb)
return 1;
spin_unlock(&eb->lock);
}
+#endif
return 0;
}
--
1.7.1.1