From 5ee0deaf1b845a04c9eeea4964c93affe20722ec Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 19 Oct 2006 23:28:36 -0700
Subject: [PATCH] --- yaml --- r: 39975 b: refs/heads/master c:
 0e7d73824e6b0024100701da246fec769dd8f087 h: refs/heads/master i:   39973:
 787bf8be24a34b11fcbf2c2bd513828b166823b1   39971:
 0a9adade87b1dad290c21fed11b6aed39a8bd8bf   39967:
 8107d0ef35b6fe9191c899990898d6639a7254bb v: v3

---
 [refs]                     | 2 +-
 trunk/fs/autofs/autofs_i.h | 1 +
 trunk/fs/autofs/dirhash.c  | 1 -
 trunk/fs/autofs/init.c     | 2 +-
 trunk/fs/autofs/inode.c    | 4 ++--
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e39e7c3e1247..8160574a1499 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2fbc6c2dad7bbcbf226c094749534f1e84d3be2
+refs/heads/master: 0e7d73824e6b0024100701da246fec769dd8f087
diff --git a/trunk/fs/autofs/autofs_i.h b/trunk/fs/autofs/autofs_i.h
index c7700d9b3f96..906ba5ce2261 100644
--- a/trunk/fs/autofs/autofs_i.h
+++ b/trunk/fs/autofs/autofs_i.h
@@ -149,6 +149,7 @@ extern const struct file_operations autofs_root_operations;
 /* Initializing function */
 
 int autofs_fill_super(struct super_block *, void *, int);
+void autofs_kill_sb(struct super_block *sb);
 
 /* Queue management functions */
 
diff --git a/trunk/fs/autofs/dirhash.c b/trunk/fs/autofs/dirhash.c
index 3fded389d06b..bf8c8af98004 100644
--- a/trunk/fs/autofs/dirhash.c
+++ b/trunk/fs/autofs/dirhash.c
@@ -246,5 +246,4 @@ void autofs_hash_nuke(struct autofs_sb_info *sbi)
 			kfree(ent);
 		}
 	}
-	shrink_dcache_sb(sbi->sb);
 }
diff --git a/trunk/fs/autofs/init.c b/trunk/fs/autofs/init.c
index aca123752406..cea5219b4f37 100644
--- a/trunk/fs/autofs/init.c
+++ b/trunk/fs/autofs/init.c
@@ -24,7 +24,7 @@ static struct file_system_type autofs_fs_type = {
 	.owner		= THIS_MODULE,
 	.name		= "autofs",
 	.get_sb		= autofs_get_sb,
-	.kill_sb	= kill_anon_super,
+	.kill_sb	= autofs_kill_sb,
 };
 
 static int __init init_autofs_fs(void)
diff --git a/trunk/fs/autofs/inode.c b/trunk/fs/autofs/inode.c
index 2c9759baad61..54c518c89e4c 100644
--- a/trunk/fs/autofs/inode.c
+++ b/trunk/fs/autofs/inode.c
@@ -20,7 +20,7 @@
 #include "autofs_i.h"
 #include <linux/module.h>
 
-static void autofs_put_super(struct super_block *sb)
+void autofs_kill_sb(struct super_block *sb)
 {
 	struct autofs_sb_info *sbi = autofs_sbi(sb);
 	unsigned int n;
@@ -37,13 +37,13 @@ static void autofs_put_super(struct super_block *sb)
 	kfree(sb->s_fs_info);
 
 	DPRINTK(("autofs: shutting down\n"));
+	kill_anon_super(sb);
 }
 
 static void autofs_read_inode(struct inode *inode);
 
 static struct super_operations autofs_sops = {
 	.read_inode	= autofs_read_inode,
-	.put_super	= autofs_put_super,
 	.statfs		= simple_statfs,
 };