36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From ae1b9d214488098cef91cc37392d2b08ee33e553 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Sun, 19 Jul 2009 08:44:27 -0500
|
|
Subject: [PATCH 200/352] fs: namespace preemption fix
|
|
|
|
On RT we cannot loop with preemption disabled here as
|
|
mnt_make_readonly() might have been preempted. We can safely enable
|
|
preemption while waiting for MNT_WRITE_HOLD to be cleared. Safe on !RT
|
|
as well.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
fs/namespace.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/fs/namespace.c b/fs/namespace.c
|
|
index 77b46bf4..1b6d18b 100644
|
|
--- a/fs/namespace.c
|
|
+++ b/fs/namespace.c
|
|
@@ -358,8 +358,11 @@ int __mnt_want_write(struct vfsmount *m)
|
|
* incremented count after it has set MNT_WRITE_HOLD.
|
|
*/
|
|
smp_mb();
|
|
- while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD)
|
|
+ while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD) {
|
|
+ preempt_enable();
|
|
cpu_relax();
|
|
+ preempt_disable();
|
|
+ }
|
|
/*
|
|
* After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will
|
|
* be set to match its requirements. So we must not load that until
|
|
--
|
|
2.7.4
|
|
|