openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mm/shmem.c: remove an ifdef 

Create a CONFIG_MMU=y stub for ramfs_nommu_expand_for_mapping() in the
usual fashion.

Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2013-04-29 15:06:12 -07:00 committed by Linus Torvalds
parent 4b59e6c473
commit 250297edf8
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/ramfs.h
View File

@ -6,7 +6,13 @@ struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir,
extern struct dentry *ramfs_mount(struct file_system_type *fs_type, extern struct dentry *ramfs_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data); int flags, const char *dev_name, void *data);
#ifndef CONFIG_MMU #ifdef CONFIG_MMU
static inline int
ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
{
return 0;
}
#else
extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize); extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize);
extern unsigned long ramfs_nommu_get_unmapped_area(struct file *file, extern unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
unsigned long addr, unsigned long addr,

5
mm/shmem.c
View File

@ -25,6 +25,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/vfs.h> #include <linux/vfs.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/ramfs.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/mm.h> #include <linux/mm.h>
@ -2830,8 +2831,6 @@ int __init shmem_init(void)
* effectively equivalent, but much lighter weight. * effectively equivalent, but much lighter weight.
*/ */
#include <linux/ramfs.h>
static struct file_system_type shmem_fs_type = { static struct file_system_type shmem_fs_type = {
.name = "tmpfs", .name = "tmpfs",
.mount = ramfs_mount, .mount = ramfs_mount,
@ -2931,11 +2930,9 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags
d_instantiate(path.dentry, inode); d_instantiate(path.dentry, inode);
inode->i_size = size; inode->i_size = size;
clear_nlink(inode); /* It is unlinked */ clear_nlink(inode); /* It is unlinked */
#ifndef CONFIG_MMU
res = ERR_PTR(ramfs_nommu_expand_for_mapping(inode, size)); res = ERR_PTR(ramfs_nommu_expand_for_mapping(inode, size));
if (IS_ERR(res)) if (IS_ERR(res))
goto put_dentry; goto put_dentry;
#endif
res = alloc_file(&path, FMODE_WRITE | FMODE_READ, res = alloc_file(&path, FMODE_WRITE | FMODE_READ,
&shmem_file_operations); &shmem_file_operations);