[PATCH] devtmpfs: support !CONFIG_TMPFS
in [Kernel]
|
Prev: 2.6.33: pci 0000:00:00.0: address space collision / spontaenous reboots
Next: [PATCH 0/2] Add support for Olimex SAM9-L9261 Development board
From: Peter Korsgaard on 12 Mar 2010 05:30 Make devtmpfs available on (embedded) configurations without SHMEM/TMPFS, using ramfs instead. Saves ~15KB. Signed-off-by: Peter Korsgaard <jacmet(a)sunsite.dk> --- drivers/base/Kconfig | 2 +- drivers/base/devtmpfs.c | 5 +++++ fs/ramfs/inode.c | 2 +- include/linux/ramfs.h | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index fd52c48..7e33b16 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -18,7 +18,7 @@ config UEVENT_HELPER_PATH config DEVTMPFS bool "Maintain a devtmpfs filesystem to mount at /dev" - depends on HOTPLUG && SHMEM && TMPFS + depends on HOTPLUG help This creates a tmpfs filesystem instance early at bootup. In this filesystem, the kernel driver core maintains device diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index dac478c..6927262 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -20,6 +20,7 @@ #include <linux/namei.h> #include <linux/fs.h> #include <linux/shmem_fs.h> +#include <linux/ramfs.h> #include <linux/cred.h> #include <linux/sched.h> #include <linux/init_task.h> @@ -44,7 +45,11 @@ __setup("devtmpfs.mount=", mount_param); static int dev_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { +#ifdef CONFIG_TMPFS return get_sb_single(fs_type, flags, data, shmem_fill_super, mnt); +#else + return get_sb_single(fs_type, flags, data, ramfs_fill_super, mnt); +#endif } static struct file_system_type dev_fs_type = { diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index a6090aa..1a5259a 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c @@ -213,7 +213,7 @@ static int ramfs_parse_options(char *data, struct ramfs_mount_opts *opts) return 0; } -static int ramfs_fill_super(struct super_block * sb, void * data, int silent) +int ramfs_fill_super(struct super_block *sb, void *data, int silent) { struct ramfs_fs_info *fsi; struct inode *inode = NULL; diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h index 4e768dd..8600508 100644 --- a/include/linux/ramfs.h +++ b/include/linux/ramfs.h @@ -20,4 +20,6 @@ extern const struct file_operations ramfs_file_operations; extern const struct vm_operations_struct generic_file_vm_ops; extern int __init init_rootfs(void); +int ramfs_fill_super(struct super_block *sb, void *data, int silent); + #endif -- 1.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |