diff options
| author | ssouhlal <ssouhlal@FreeBSD.org> | 2005-09-02 15:27:23 +0000 |
|---|---|---|
| committer | ssouhlal <ssouhlal@FreeBSD.org> | 2005-09-02 15:27:23 +0000 |
| commit | f8217f350bcfc82b94c814a04faf8cdd5326d033 (patch) | |
| tree | 6d3fd63626ff1d58add99ac395ebda844196e694 /sys/fs/msdosfs/msdosfs_vfsops.c | |
| parent | 912d183e0b4eff2d1cfeacc98dc5720f1461a947 (diff) | |
| download | FreeBSD-src-f8217f350bcfc82b94c814a04faf8cdd5326d033.zip FreeBSD-src-f8217f350bcfc82b94c814a04faf8cdd5326d033.tar.gz | |
*_mountfs() (if the filesystem mounts from a device) needs devvp to be
locked, so lock it.
Glanced at by: phk
MFC after: 3 days
Diffstat (limited to 'sys/fs/msdosfs/msdosfs_vfsops.c')
| -rw-r--r-- | sys/fs/msdosfs/msdosfs_vfsops.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 288f22d..037d9b4 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -336,7 +336,7 @@ msdosfs_mount(struct mount *mp, struct thread *td) */ if (vfs_getopt(mp->mnt_optnew, "from", (void **)&from, NULL)) return (EINVAL); - NDINIT(&ndp, LOOKUP, FOLLOW, UIO_SYSSPACE, from, td); + NDINIT(&ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, from, td); error = namei(&ndp); if (error) return (error); @@ -344,7 +344,7 @@ msdosfs_mount(struct mount *mp, struct thread *td) NDFREE(&ndp, NDF_ONLY_PNBUF); if (!vn_isdisk(devvp, &error)) { - vrele(devvp); + vput(devvp); return (error); } /* @@ -355,13 +355,11 @@ msdosfs_mount(struct mount *mp, struct thread *td) accessmode = VREAD; if ((mp->mnt_flag & MNT_RDONLY) == 0) accessmode |= VWRITE; - vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); error = VOP_ACCESS(devvp, accessmode, td->td_ucred, td); if (error) { vput(devvp); return (error); } - VOP_UNLOCK(devvp, 0, td); } if ((mp->mnt_flag & MNT_UPDATE) == 0) { error = mountmsdosfs(devvp, mp, td); @@ -372,7 +370,7 @@ msdosfs_mount(struct mount *mp, struct thread *td) if (devvp != pmp->pm_devvp) error = EINVAL; /* XXX needs translation */ else - vrele(devvp); + vput(devvp); } if (error) { vrele(devvp); |
