diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-01 20:22:53 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-01 23:50:45 -0500 |
commit | 26567cdbbf1a6b13a92a82332daee00672aa48a9 (patch) | |
tree | 4f113bb2479fc52e0a734c8edc5645e8da3622e6 /mm | |
parent | dd37978c50bc8b354e5c4633f69387f16572fdac (diff) |
fix nommu breakage in shmem.c
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/shmem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index ed2befb4952e..1c44af71fcf5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -2932,9 +2932,8 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags | |||
2932 | inode->i_size = size; | 2932 | inode->i_size = size; |
2933 | clear_nlink(inode); /* It is unlinked */ | 2933 | clear_nlink(inode); /* It is unlinked */ |
2934 | #ifndef CONFIG_MMU | 2934 | #ifndef CONFIG_MMU |
2935 | error = ramfs_nommu_expand_for_mapping(inode, size); | 2935 | res = ERR_PTR(ramfs_nommu_expand_for_mapping(inode, size)); |
2936 | res = ERR_PTR(error); | 2936 | if (IS_ERR(res)) |
2937 | if (error) | ||
2938 | goto put_dentry; | 2937 | goto put_dentry; |
2939 | #endif | 2938 | #endif |
2940 | 2939 | ||