Re: [git pull] VFS stuff, part 1

[Al Viro <viro@ZenIV.linux.org.uk>]

On Thu, Dec 17, 2009 at 12:02:11AM +0000, Tony Vroon wrote:
> On Wed, 2009-12-16 at 23:27 +0000, Al Viro wrote:
> > > Do you want me to revert 1c7c474c31aea6d5cb2fb35f31d9e9e91ae466b1
> > > locally or try linux-2.6 old enough not to have this?
> > The former.
> 
> That resolves the issue completely. I am now able to boot.

Oh, fsck...  I see.  Linus, the fix is added to the same branch (and
I'll throw the fix for removed alloc_file export there in a few minutes).
In the meanwhile, see if this fixes it

8f4cb3a4252a053d2c7299d7d251389bddf0bcd4
diff --git a/mm/shmem.c b/mm/shmem.c
index f848506..eef4ebe 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;