Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc

[deliverable/linux.git] / fs / namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index 7ca5182c0bedd547e21531e777175d2058ea2982..3dbfc072ec70aa0099b79b3ff1040455543c46ca 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -13,7 +13,6 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/percpu.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/acct.h>
@@ -595,7 +594,7 @@ static struct vfsmount *clone_mnt(struct vfsmount *old, struct dentry *root,
                                goto out_free;
                }
 
-               mnt->mnt_flags = old->mnt_flags;
+               mnt->mnt_flags = old->mnt_flags & ~MNT_WRITE_HOLD;
                atomic_inc(&sb->s_active);
                mnt->mnt_sb = sb;
                mnt->mnt_root = dget(root);