From 6a73227278d31b4eda06e6e31bcb92118c633ed1 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 16 Dec 2009 19:35:36 -0500
Subject: [PATCH] --- yaml --- r: 177679 b: refs/heads/master c:
 718deb6b61e34c200c1f2b706176d9aac334cb2d h: refs/heads/master i:   177677:
 2d6c403ced53412e841b25e87eed5a2798f4e5fc   177675:
 fb65ddd03a66c46f31000a2701b5f2198300722e   177671:
 4cec5a1fbe9ded16e135618c79fba76613a9bf04   177663:
 b4eb24ffce20b48c2db2aad08cc888356ec03baa v: v3

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

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;