summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2009-12-17 01:35:36 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2009-12-17 01:48:48 +0100
commit718deb6b61e34c200c1f2b706176d9aac334cb2d (patch)
treefdf37190a8663d507bc740a6fa21437c6c22e611 /mm
parentMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff)
downloadlinux-718deb6b61e34c200c1f2b706176d9aac334cb2d.tar.xz
linux-718deb6b61e34c200c1f2b706176d9aac334cb2d.zip
Fix breakage in shmem.c
Replacing error = 0; if (error) op with nothing is not quite an equivalent transformation ;-) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r--mm/shmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index f8485062f3ba..eef4ebea5158 100644
--- a/mm/shmem.c
+++ b/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;