jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Solaris: shutdown in freevfs, not unmount

Browse Source 
Call the afs shutdown sequence (afs_shutdown()) in the VFS_FREEVFS
handler, instead of in the VFS_UNMOUNT handler. This way we shutdown
when the last reference to our vfs goes away, instead of when we are
unmounted. That doesn't make much of a difference right now, but doing
so will be required for supporting forced unmounts.

Change-Id: I4158865b139d05e2955e4809b93628df27b83922
Reviewed-on: http://gerrit.openafs.org/1899
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Andrew Deason 2010-05-03 14:57:28 -05:00 committed by Derrick Brashear
parent fc8ab5cfd6
commit 7084e5ff7d
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/afs/SOLARIS/osi_vfsops.c
View File

@ -79,6 +79,8 @@ int
afs_unmount(struct vfs *afsp, afs_ucred_t *credp) afs_unmount(struct vfs *afsp, afs_ucred_t *credp)
#endif #endif
{ {
struct vcache *rootvp = NULL;
AFS_GLOCK(); AFS_GLOCK();
AFS_STATCNT(afs_unmount); AFS_STATCNT(afs_unmount);
@ -110,14 +112,38 @@ afs_unmount(struct vfs *afsp, afs_ucred_t *credp)
AFS_GUNLOCK(); AFS_GUNLOCK();
return EBUSY; return EBUSY;
} }
afsp->vfs_flag |= VFS_UNMOUNTED;
#endif /* AFS_SUN58_ENV */ #endif /* AFS_SUN58_ENV */
/* release the root vnode, which should be the last reference to us
* besides the caller of afs_unmount */
rootvp = afs_globalVp;
afs_globalVp = NULL;
AFS_RELE(rootvp);
#ifndef AFS_SUN58_ENV
/* shutdown now, since afs_freevfs() will not be called */
afs_globalVFS = 0;
afs_shutdown();
#endif /* !AFS_SUN58_ENV */
AFS_GUNLOCK();
return 0;
}
#ifdef AFS_SUN58_ENV
void
afs_freevfs(struct vfs *afsp)
{
AFS_GLOCK();
afs_globalVFS = 0; afs_globalVFS = 0;
afs_shutdown(); afs_shutdown();
AFS_GUNLOCK(); AFS_GUNLOCK();
return 0;
} }
#endif /* AFS_SUN58_ENV */
int int
afs_root(struct vfs *afsp, struct vnode **avpp) afs_root(struct vfs *afsp, struct vnode **avpp)
@ -289,7 +315,7 @@ static const fs_operation_def_t afs_vfsops_template[] = {
VFSNAME_SYNC, { .vfs_sync = afs_sync }, VFSNAME_SYNC, { .vfs_sync = afs_sync },
VFSNAME_VGET, { .vfs_vget = afs_vget }, VFSNAME_VGET, { .vfs_vget = afs_vget },
VFSNAME_MOUNTROOT, { .vfs_mountroot = afs_mountroot }, VFSNAME_MOUNTROOT, { .vfs_mountroot = afs_mountroot },
VFSNAME_FREEVFS, { .vfs_freevfs = fs_freevfs }, VFSNAME_FREEVFS, { .vfs_freevfs = afs_freevfs },
NULL, NULL NULL, NULL
}; };
struct vfsops *afs_vfsopsp; struct vfsops *afs_vfsopsp;
@ -303,7 +329,7 @@ const fs_operation_def_t afs_vfsops_template[] = {
VFSNAME_SYNC, afs_sync, VFSNAME_SYNC, afs_sync,
VFSNAME_VGET, afs_vget, VFSNAME_VGET, afs_vget,
VFSNAME_MOUNTROOT, afs_mountroot, VFSNAME_MOUNTROOT, afs_mountroot,
VFSNAME_FREEVFS, fs_freevfs, VFSNAME_FREEVFS, afs_freevfs,
NULL, NULL NULL, NULL
}; };
struct vfsops *afs_vfsopsp; struct vfsops *afs_vfsopsp;
@ -318,7 +344,7 @@ struct vfsops Afs_vfsops = {
afs_mountroot, afs_mountroot,
afs_swapvp, afs_swapvp,
#if defined(AFS_SUN58_ENV) #if defined(AFS_SUN58_ENV)
fs_freevfs, afs_freevfs,
#endif #endif
}; };
#endif #endif