---

yaml --- r: 177679 b: refs/heads/master c: 718deb6 h: refs/heads/master i: 177677: 2d6c403 177675: fb65ddd 177671: 4cec5a1 177663: b4eb24f v: v3
git-mirror · Dec 17, 2009 · 6a73227 · 6a73227
1 parent 5eeb3bc
commit 6a73227
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;