From 972f29565b3ce3cbc13732276db3e5d8a7f8a16f Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Fri, 25 Jan 2013 16:32:10 -0800
Subject: [PATCH] --- yaml --- r: 357759 b: refs/heads/master c:
 2b8576cb09a7b1b581c253554bf9e05d3adce7d6 h: refs/heads/master i:   357757:
 aaa6fa7efb4008db5b960cc9d40c4078259a5d1c   357755:
 651056f9b3403e7a01cb81cec011bad258e40fa7   357751:
 d56261949ea96f4e5110f1374fac4c6d14ebab39   357743:
 888daf93878618584295d591ac5e9bba9f293f9b   357727:
 7545dc7c74a99755ade9f2983a773df84cd1c88a   357695:
 6ac90d6dc5634ab09ce2fc5b061e6602d404aa3d   357631:
 3c4188ae49cc3e060c0dbccba1d9b5b23829ac3e v: v3

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

diff --git a/[refs] b/[refs]
index cc29e68b85e3..24f7663dbf91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3c6761d9b5cc82deea7416d11c2118f6380e99c
+refs/heads/master: 2b8576cb09a7b1b581c253554bf9e05d3adce7d6
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index 5c90d84c2b02..197ca5eccbae 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -2766,6 +2766,7 @@ static struct file_system_type shmem_fs_type = {
 	.name		= "tmpfs",
 	.mount		= shmem_mount,
 	.kill_sb	= kill_litter_super,
+	.fs_flags	= FS_USERNS_MOUNT,
 };
 
 int __init shmem_init(void)
@@ -2823,6 +2824,7 @@ static struct file_system_type shmem_fs_type = {
 	.name		= "tmpfs",
 	.mount		= ramfs_mount,
 	.kill_sb	= kill_litter_super,
+	.fs_flags	= FS_USERNS_MOUNT,
 };
 
 int __init shmem_init(void)