aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/inode.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-09 09:34:20 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-09 09:34:20 -0400
commit51d8fa6a109589d522c18a8e9bf3fb167a91b1bc (patch)
treea9ec5e642bfa64f7cf1fde01617b30bac385bac6 /fs/nfs/inode.c
parent55a975937d40cac582e981ddc8ed783b3dcc043c (diff)
NFS: Add timeout to submounts
Make automounted partitions expire using the mark_mounts_for_expiry() function. The timeout is controlled via a sysctl. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r--fs/nfs/inode.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 47167ab64f5b..3eea556d8f59 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -167,6 +167,7 @@ static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags)
167 struct nfs_server *server; 167 struct nfs_server *server;
168 struct rpc_clnt *rpc; 168 struct rpc_clnt *rpc;
169 169
170 shrink_submounts(vfsmnt, &nfs_automount_list);
170 if (!(flags & MNT_FORCE)) 171 if (!(flags & MNT_FORCE))
171 return; 172 return;
172 /* -EIO all pending I/O */ 173 /* -EIO all pending I/O */
@@ -1943,6 +1944,7 @@ static void nfs_kill_super(struct super_block *s)
1943 nfs_free_iostats(server->io_stats); 1944 nfs_free_iostats(server->io_stats);
1944 kfree(server->hostname); 1945 kfree(server->hostname);
1945 kfree(server); 1946 kfree(server);
1947 nfs_release_automount_timer();
1946} 1948}
1947 1949
1948static struct file_system_type nfs_fs_type = { 1950static struct file_system_type nfs_fs_type = {
@@ -2288,6 +2290,7 @@ static void nfs4_kill_super(struct super_block *sb)
2288 nfs_free_iostats(server->io_stats); 2290 nfs_free_iostats(server->io_stats);
2289 kfree(server->hostname); 2291 kfree(server->hostname);
2290 kfree(server); 2292 kfree(server);
2293 nfs_release_automount_timer();
2291} 2294}
2292 2295
2293static struct file_system_type nfs4_fs_type = { 2296static struct file_system_type nfs4_fs_type = {