diff --git a/[refs] b/[refs]
index c75f5b5fe3ca..bb283546ae09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bea4c899f2b5fad80099aea979780ef19f9b1987
+refs/heads/master: 718deb6b61e34c200c1f2b706176d9aac334cb2d
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index f8485062f3ba..eef4ebea5158 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -1830,6 +1830,8 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 			iput(inode);
 			return error;
 		}
+#else
+		error = 0;
 #endif
 		if (dir->i_mode & S_ISGID) {
 			inode->i_gid = dir->i_gid;