d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't restore mnt_kern_flag on failed MNT_UPDATE mount, it can race

Browse Source 
with dounmount(), causing loss of MNTK_UNMOUNT flag.
This commit is contained in:
Tor Egge 2006-09-26 04:15:04 +00:00
parent 5da56ddb21
commit cea9d840d8
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/vfs_mount.c
View File

@ -790,7 +790,7 @@ vfs_domount(
struct mount *mp;
struct vfsconf *vfsp;
struct export_args export;
int error, flag = 0, kern_flag = 0;
int error, flag = 0;
struct vattr va;
struct nameidata nd;
@ -852,7 +852,6 @@ vfs_domount(
mp = vp->v_mount;
MNT_ILOCK(mp);
flag = mp->mnt_flag;
kern_flag = mp->mnt_kern_flag;
/*
* We only allow the filesystem to be reloaded if it
* is currently mounted read-only.
@ -980,10 +979,8 @@ vfs_domount(
MNT_ILOCK(mp);
mp->mnt_flag &=
~(MNT_UPDATE | MNT_RELOAD | MNT_FORCE | MNT_SNAPSHOT);
if (error) {
if (error)
mp->mnt_flag = flag;
mp->mnt_kern_flag = kern_flag;
}
MNT_IUNLOCK(mp);
if ((mp->mnt_flag & MNT_RDONLY) == 0) {
if (mp->mnt_syncer == NULL)