1 diff -ruw linux-2.6.30.orig/fs/Kconfig linux-2.6.30/fs/Kconfig
2 --- linux-2.6.30.orig/fs/Kconfig 2009-02-12 17:51:15.000000000 +0000
3 +++ linux-2.6.30/fs/Kconfig 2009-02-13 12:01:55.000000000 +0000
6 If you don't know what Access Control Lists are, say N.
9 + bool "Use tmpfs instead of ramfs for initramfs"
10 + depends on TMPFS && SHMEM
13 + This replaces the ramfs used for unpacking the cpio images
17 + bool "Ramfs file system support" if TMPFS_ROOT
20 + Ramfs is a file system which keeps all files in RAM. Unlike tmpfs,
21 + it cannot be swapped to disk, and it has the risk of deadlocking
22 + the system by using all memory.
24 + Ramfs is used for booting the system and unpacking the cpio if
25 + TMPFS_ROOT is not set.
28 bool "HugeTLB file system support"
29 depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \
30 diff -ruw linux-2.6.30.orig/fs/ramfs/inode.c linux-2.6.30/fs/ramfs/inode.c
31 --- linux-2.6.30.orig/fs/ramfs/inode.c 2009-02-12 17:51:15.000000000 +0000
32 +++ linux-2.6.30/fs/ramfs/inode.c 2009-02-13 11:30:30.000000000 +0000
38 struct dentry *ramfs_mount(struct file_system_type *fs_type,
39 int flags, const char *dev_name, void *data)
41 return mount_nodev(fs_type, flags, data, ramfs_fill_super);
44 -static struct dentry *rootfs_mount(struct file_system_type *fs_type,
45 - int flags, const char *dev_name, void *data)
47 - return mount_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super);
49 +static struct file_system_type ramfs_fs_type = {
51 + .mount = ramfs_mount,
52 + .kill_sb = kill_litter_super,
55 static void ramfs_kill_sb(struct super_block *sb)
58 kill_litter_super(sb);
61 -static struct file_system_type ramfs_fs_type = {
63 - .mount = ramfs_mount,
64 - .kill_sb = kill_litter_super,
66 +#ifndef CONFIG_TMPFS_ROOT
67 +static struct dentry *rootfs_mount(struct file_system_type *fs_type,
68 + int flags, const char *dev_name, void *data)
70 + return mount_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super);
73 static struct file_system_type rootfs_fs_type = {
75 .mount = rootfs_mount,
76 .kill_sb = kill_litter_super,
79 -static int __init init_ramfs_fs(void)
81 - return register_filesystem(&ramfs_fs_type);
84 -static void __exit exit_ramfs_fs(void)
86 - unregister_filesystem(&ramfs_fs_type);
89 -module_init(init_ramfs_fs)
90 -module_exit(exit_ramfs_fs)
92 int __init init_rootfs(void)
101 +static int __init init_ramfs_fs(void)
103 + return register_filesystem(&ramfs_fs_type);
106 +static void __exit exit_ramfs_fs(void)
108 + unregister_filesystem(&ramfs_fs_type);
111 +module_init(init_ramfs_fs)
112 +module_exit(exit_ramfs_fs)
114 MODULE_LICENSE("GPL");
115 diff -ruw linux-2.6.30.orig/mm/shmem.c linux-2.6.30/mm/shmem.c
116 --- linux-2.6.30.orig/mm/shmem.c 2009-02-12 17:51:15.000000000 +0000
117 +++ linux-2.6.30/mm/shmem.c 2009-02-13 11:42:02.000000000 +0000
120 static unsigned long shmem_default_max_blocks(void)
122 - return totalram_pages / 2;
123 + return totalram_pages / 10 * 9;
126 static unsigned long shmem_default_max_inodes(void)
127 @@ -2369,6 +2369,10 @@
129 static int shmem_init_inodecache(void)
131 +#ifdef CONFIG_TMPFS_ROOT
132 + if (shmem_inode_cachep)
135 shmem_inode_cachep = kmem_cache_create("shmem_inode_cache",
136 sizeof(struct shmem_inode_info),
137 0, SLAB_PANIC, init_once);
138 @@ -2587,6 +2591,27 @@
140 EXPORT_SYMBOL_GPL(shmem_file_setup);
142 +#ifdef CONFIG_TMPFS_ROOT
149 +static struct file_system_type rootfs_fs_type = {
151 + .mount = shmem_mount,
152 + .kill_sb = kill_litter_super,
155 +int __init init_rootfs(void)
157 + if (shmem_init_inodecache())
158 + panic("Can't initialize shm inode cache");
159 + return register_filesystem(&rootfs_fs_type);
164 * shmem_zero_setup - setup a shared anonymous mapping
165 * @vma: the vma to be mmapped is prepared by do_mmap_pgoff