diff options
| author | David Greenman <dg@FreeBSD.org> | 1998-07-03 03:47:24 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1998-07-03 03:47:24 +0000 |
| commit | e25169f23997da32ddf8d011b5514dd533d9bcb4 (patch) | |
| tree | 4247791a1742e1dc286476ab9e9931708b7f4f06 | |
| parent | 6ca4ca24761eede7d191e139c64e0be830b05a1c (diff) | |
| download | src-e25169f23997da32ddf8d011b5514dd533d9bcb4.tar.gz src-e25169f23997da32ddf8d011b5514dd533d9bcb4.zip | |
Reset MNT_ASYNC flag if needed if unmount() should fail.
Submitted by: Paul Saab <paul@mu.org>
Notes
Notes:
svn path=/head/; revision=37346
| -rw-r--r-- | sys/kern/vfs_extattr.c | 5 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 840687a9b04d..4d7dff3aa928 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.102 1998/06/07 17:11:47 dfr Exp $ + * $Id: vfs_syscalls.c,v 1.103 1998/06/08 18:18:28 dyson Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -435,6 +435,7 @@ dounmount(mp, flags, p) { struct vnode *coveredvp; int error; + int async_flag; simple_lock(&mountlist_slock); mp->mnt_kern_flag |= MNTK_UNMOUNT; @@ -444,6 +445,7 @@ dounmount(mp, flags, p) vfs_setpublicfs(NULL, NULL, NULL); vfs_msync(mp, MNT_WAIT); + async_flag = mp->mnt_flag & MNT_ASYNC; mp->mnt_flag &=~ MNT_ASYNC; cache_purgevfs(mp); /* remove cache entries for this file sys */ if (mp->mnt_syncer != NULL) @@ -457,6 +459,7 @@ dounmount(mp, flags, p) if ((mp->mnt_flag & MNT_RDONLY) == 0 && mp->mnt_syncer == NULL) (void) vfs_allocate_syncvnode(mp); mp->mnt_kern_flag &= ~MNTK_UNMOUNT; + mp->mnt_flag |= async_flag; lockmgr(&mp->mnt_lock, LK_RELEASE | LK_INTERLOCK | LK_REENABLE, &mountlist_slock, p); return (error); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 840687a9b04d..4d7dff3aa928 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.102 1998/06/07 17:11:47 dfr Exp $ + * $Id: vfs_syscalls.c,v 1.103 1998/06/08 18:18:28 dyson Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -435,6 +435,7 @@ dounmount(mp, flags, p) { struct vnode *coveredvp; int error; + int async_flag; simple_lock(&mountlist_slock); mp->mnt_kern_flag |= MNTK_UNMOUNT; @@ -444,6 +445,7 @@ dounmount(mp, flags, p) vfs_setpublicfs(NULL, NULL, NULL); vfs_msync(mp, MNT_WAIT); + async_flag = mp->mnt_flag & MNT_ASYNC; mp->mnt_flag &=~ MNT_ASYNC; cache_purgevfs(mp); /* remove cache entries for this file sys */ if (mp->mnt_syncer != NULL) @@ -457,6 +459,7 @@ dounmount(mp, flags, p) if ((mp->mnt_flag & MNT_RDONLY) == 0 && mp->mnt_syncer == NULL) (void) vfs_allocate_syncvnode(mp); mp->mnt_kern_flag &= ~MNTK_UNMOUNT; + mp->mnt_flag |= async_flag; lockmgr(&mp->mnt_lock, LK_RELEASE | LK_INTERLOCK | LK_REENABLE, &mountlist_slock, p); return (error); |