Author: mckusick
Date: Thu Jan 23 06:11:25 2020
New Revision: 357031
URL: https://svnweb.freebsd.org/changeset/base/357031
Log:
MFC of 356763
Remove call to VFS_SYNC() to avoid unmount livelock
Modified:
stable/12/sys/kern/vfs_mount.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/kern/vfs_mount.c
==============================================================================
--- stable/12/sys/kern/vfs_mount.c Thu Jan 23 06:06:32 2020
(r357030)
+++ stable/12/sys/kern/vfs_mount.c Thu Jan 23 06:11:25 2020
(r357031)
@@ -1438,9 +1438,7 @@ dounmount(struct mount *mp, int flags, struct thread *
MNT_IUNLOCK(mp);
cache_purgevfs(mp, false); /* remove cache entries for this file sys */
vfs_deallocate_syncvnode(mp);
- if ((mp->mnt_flag & MNT_RDONLY) != 0 || (flags & MNT_FORCE) != 0 ||
- (error = VFS_SYNC(mp, MNT_WAIT)) == 0)
- error = VFS_UNMOUNT(mp, flags);
+ error = VFS_UNMOUNT(mp, flags);
vn_finished_write(mp);
/*
* If we failed to flush the dirty blocks for this mount point,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
