aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2004-11-07 03:39:35 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-07 03:39:35 -0800
commit2c86490e25482c32acec0a1b2dae2fb76921ab53 (patch)
tree8cdfbfcaeeb741af8e793d56461daf50af84681d /mm
parentab8b6bc23e496dcb823c6a129f316cb5babb0085 (diff)
downloadhistory-2c86490e25482c32acec0a1b2dae2fb76921ab53.tar.gz
[PATCH] tmpfs: CONFIG_TMPFS=n mount fix
My tmpfs superblock changes in 2.6.9 messed up mount -t tmpfs when CONFIG_TMPFS is not enabled: it wrongly claimed to succeed, and left the directory unusable, giving "Not a directory" errors thereafter. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/shmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 5bebd17bd46d93..142cb61c080b8e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1986,6 +1986,8 @@ static int shmem_fill_super(struct super_block *sb,
sbinfo->free_inodes = inodes;
}
sb->s_xattr = shmem_xattr_handlers;
+#else
+ sb->s_flags |= MS_NOUSER;
#endif
sb->s_maxbytes = SHMEM_MAX_BYTES;