commit | 26567cdbbf1a6b13a92a82332daee00672aa48a9 | [log] [tgz] |
---|---|---|
author | Al Viro <viro@zeniv.linux.org.uk> | Fri Mar 01 20:22:53 2013 -0500 |
committer | Al Viro <viro@zeniv.linux.org.uk> | Fri Mar 01 23:50:45 2013 -0500 |
tree | 4f113bb2479fc52e0a734c8edc5645e8da3622e6 | |
parent | dd37978c50bc8b354e5c4633f69387f16572fdac [diff] [blame] |
fix nommu breakage in shmem.c Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/mm/shmem.c b/mm/shmem.c index ed2befb..1c44af7 100644 --- a/mm/shmem.c +++ b/mm/shmem.c
@@ -2932,9 +2932,8 @@ inode->i_size = size; clear_nlink(inode); /* It is unlinked */ #ifndef CONFIG_MMU - error = ramfs_nommu_expand_for_mapping(inode, size); - res = ERR_PTR(error); - if (error) + res = ERR_PTR(ramfs_nommu_expand_for_mapping(inode, size)); + if (IS_ERR(res)) goto put_dentry; #endif