diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:19:12 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:37:18 (GMT) |
| commit | 86ba38e6f5f2fbfe9b49e153ea89593b26482019 (patch) | |
| tree | f99d2906b0eafca507f37289e68052fc105cc2dc /fs/namespace.c | |
| parent | 07c8b57b111585a617b2b456497fc9b33c00743c (diff) | |
| download | linux-fsl-qoriq-86ba38e6f5f2fbfe9b49e153ea89593b26482019.tar.xz | |
Reset to 3.12.19
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 22cbfab..84447db 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -23,7 +23,6 @@ #include <linux/uaccess.h> #include <linux/proc_ns.h> #include <linux/magic.h> -#include <linux/delay.h> #include "pnode.h" #include "internal.h" @@ -316,11 +315,8 @@ 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) { - preempt_enable(); - cpu_chill(); - preempt_disable(); - } + while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD) + cpu_relax(); /* * After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will * be set to match its requirements. So we must not load that until |