From 8945a8eed317a5e74db5fc6b4186fb0b16e9a715 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Tue, 29 May 2012 15:06:38 -0700
Subject: [PATCH] --- yaml --- r: 308867 b: refs/heads/master c:
 2f6e38f3cd17a7858112f538c1700c747170db1f h: refs/heads/master i:   308865:
 3c9ef42a51fd6cac321b226c4aef56c168881408   308863:
 60a4fa2b5765e7100a062fbc3c91a5bb611eadc9 v: v3

---
 [refs]           | 2 +-
 trunk/mm/shmem.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 25bb22a5cb84..fab30291f486 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bde05d1ccd512696b09db9dd2e5f33ad19152605
+refs/heads/master: 2f6e38f3cd17a7858112f538c1700c747170db1f
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index db72d8e44ec6..fe5ae6962ab3 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -2373,6 +2373,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
 		}
 	}
 	sb->s_export_op = &shmem_export_ops;
+	sb->s_flags |= MS_NOSEC;
 #else
 	sb->s_flags |= MS_NOUSER;
 #endif