Add a check for MNTK_UNMOUNTF at the beginning of nfs_sync()
in the old NFS client so that a forced dismount doesn't get stuck in the VFS_SYNC() call that happens before VFS_UNMOUNT() in dounmount(). Analagous to r222329 for the new NFS client. An additional change is needed before forced dismounts will work. PR: kern/157365 MFC after: 2 weeks
This commit is contained in:
parent
d015abb774
commit
a8842a96db
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=222464
@ -1408,10 +1408,20 @@ nfs_sync(struct mount *mp, int waitfor)
|
||||
|
||||
td = curthread;
|
||||
|
||||
MNT_ILOCK(mp);
|
||||
/*
|
||||
* If a forced dismount is in progress, return from here so that
|
||||
* the umount(2) syscall doesn't get stuck in VFS_SYNC() before
|
||||
* calling VFS_UNMOUNT().
|
||||
*/
|
||||
if ((mp->mnt_kern_flag & MNTK_UNMOUNTF) != 0) {
|
||||
MNT_IUNLOCK(mp);
|
||||
return (EBADF);
|
||||
}
|
||||
|
||||
/*
|
||||
* Force stale buffer cache information to be flushed.
|
||||
*/
|
||||
MNT_ILOCK(mp);
|
||||
loop:
|
||||
MNT_VNODE_FOREACH(vp, mp, mvp) {
|
||||
VI_LOCK(vp);
|
||||
|
Loading…
Reference in New Issue
Block a user