commit 78d31a3a87f84cf56004b7bc154831f2ee1186e8
author Igor Mammedov <niallain@gmail.com> Thu Apr 24 12:56:07 2008 +0400
committer Al Viro <viro@zeniv.linux.org.uk> Fri Apr 25 09:15:26 2008 -0400
tree 0b18911e95f08dc2bce01c1555fe65f1865b0c71
parent b69d3987f4360a5e7e9e55465b3cdd0cc204b79e

cifs: timeout dfs automounts +little fix.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/cifs/cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index a04b17e..dbb2cd6 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -471,8 +471,6 @@
 	struct cifs_sb_info *cifs_sb;
 	struct cifsTconInfo *tcon;
 
-	dfs_shrink_umount_helper(vfsmnt);
-
 	if (!(flags & MNT_FORCE))
 		return;
 	cifs_sb = CIFS_SB(vfsmnt->mnt_sb);
@@ -1100,6 +1098,7 @@
 	cFYI(DBG2, ("exit_cifs"));
 	cifs_proc_clean();
 #ifdef CONFIG_CIFS_DFS_UPCALL
+	cifs_dfs_release_automount_timer();
 	unregister_key_type(&key_type_dns_resolver);
 #endif
 #ifdef CONFIG_CIFS_UPCALL