--- zzzz-none-000/linux-2.6.19.2/fs/autofs4/inode.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/fs/autofs4/inode.c	2007-01-19 14:42:56.000000000 +0000
@@ -99,9 +99,6 @@
 	struct dentry *this_parent = sbi->sb->s_root;
 	struct list_head *next;
 
-	if (!sbi->sb->s_root)
-		return;
-
 	spin_lock(&dcache_lock);
 repeat:
 	next = this_parent->d_subdirs.next;
@@ -149,15 +146,6 @@
 {
 	struct autofs_sb_info *sbi = autofs4_sbi(sb);
 
-	/*
-	 * In the event of a failure in get_sb_nodev the superblock
-	 * info is not present so nothing else has been setup, so
-	 * just call kill_anon_super when we are called from
-	 * deactivate_super.
-	 */
-	if (!sbi)
-		goto out_kill_sb;
-
 	sb->s_fs_info = NULL;
 
 	if ( !sbi->catatonic )
@@ -323,8 +311,7 @@
 	s->s_fs_info = sbi;
 	sbi->magic = AUTOFS_SBI_MAGIC;
 	sbi->pipefd = -1;
-	sbi->pipe = NULL;
-	sbi->catatonic = 1;
+	sbi->catatonic = 0;
 	sbi->exp_timeout = 0;
 	sbi->oz_pgrp = process_group(current);
 	sbi->sb = s;
@@ -402,7 +389,6 @@
 		goto fail_fput;
 	sbi->pipe = pipe;
 	sbi->pipefd = pipefd;
-	sbi->catatonic = 0;
 
 	/*
 	 * Success! Install the root dentry now to indicate completion.
@@ -427,7 +413,6 @@
 	kfree(ino);
 fail_free:
 	kfree(sbi);
-	s->s_fs_info = NULL;
 fail_unlock:
 	return -EINVAL;
 }