---

yaml --- r: 360723 b: refs/heads/master c: 26567cd h: refs/heads/master i: 360721: de9a95c 360719: 1635e16 v: v3
git-mirror · Mar 2, 2013 · 860cb8e · 860cb8e
1 parent 2b9264d
commit 860cb8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd37978c50bc8b354e5c4633f69387f16572fdac
+refs/heads/master: 26567cdbbf1a6b13a92a82332daee00672aa48a9
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
@@ -2932,9 +2932,8 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags
 	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