From 860cb8e851721e4e74064754c7e29b54e4fc0e71 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 1 Mar 2013 20:22:53 -0500
Subject: [PATCH] --- yaml --- r: 360723 b: refs/heads/master c:
 26567cdbbf1a6b13a92a82332daee00672aa48a9 h: refs/heads/master i:   360721:
 de9a95cb6a97a4b99b4d74b52fe8b7554317529d   360719:
 1635e162380abaef679278040f20019f1f3e6f64 v: v3

---
 [refs]           | 2 +-
 trunk/mm/shmem.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index edda66216f77..3b5f55e40ad7 100644
--- 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
index ed2befb4952e..1c44af71fcf5 100644
--- 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