diff options
| author | Igor Mammedov | 2008-04-24 10:56:07 +0200 |
|---|---|---|
| committer | Al Viro | 2008-04-25 15:15:26 +0200 |
| commit | 78d31a3a87f84cf56004b7bc154831f2ee1186e8 (patch) | |
| tree | 0b18911e95f08dc2bce01c1555fe65f1865b0c71 /fs/cifs/cifsfs.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86... (diff) | |
| download | kernel-qcow2-linux-78d31a3a87f84cf56004b7bc154831f2ee1186e8.tar.gz kernel-qcow2-linux-78d31a3a87f84cf56004b7bc154831f2ee1186e8.tar.xz kernel-qcow2-linux-78d31a3a87f84cf56004b7bc154831f2ee1186e8.zip | |
cifs: timeout dfs automounts +little fix.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index a04b17e5a9d0..dbb2cd678bf5 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -471,8 +471,6 @@ static void cifs_umount_begin(struct vfsmount *vfsmnt, int flags) 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 @@ exit_cifs(void) 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 |