Revert r251590. It unexpectedly broke the build and there were some
questions on locking. As part of commit-bit grooming, I'd like Steve to handle this, but can't leave things broken in the mean time.
This commit is contained in:
parent
f506e293ab
commit
4612275fdb
sys
@ -864,7 +864,6 @@ vfs_domount_first(
|
|||||||
VOP_UNLOCK(newdp, 0);
|
VOP_UNLOCK(newdp, 0);
|
||||||
VOP_UNLOCK(vp, 0);
|
VOP_UNLOCK(vp, 0);
|
||||||
mountcheckdirs(vp, newdp);
|
mountcheckdirs(vp, newdp);
|
||||||
EVENTHANDLER_INVOKE(vfs_mounted, mp, newdp, td);
|
|
||||||
vrele(newdp);
|
vrele(newdp);
|
||||||
if ((mp->mnt_flag & MNT_RDONLY) == 0)
|
if ((mp->mnt_flag & MNT_RDONLY) == 0)
|
||||||
vfs_allocate_syncvnode(mp);
|
vfs_allocate_syncvnode(mp);
|
||||||
@ -1356,7 +1355,6 @@ dounmount(mp, flags, td)
|
|||||||
mtx_lock(&mountlist_mtx);
|
mtx_lock(&mountlist_mtx);
|
||||||
TAILQ_REMOVE(&mountlist, mp, mnt_list);
|
TAILQ_REMOVE(&mountlist, mp, mnt_list);
|
||||||
mtx_unlock(&mountlist_mtx);
|
mtx_unlock(&mountlist_mtx);
|
||||||
EVENTHANDLER_INVOKE(vfs_unmounted, mp, td);
|
|
||||||
if (coveredvp != NULL) {
|
if (coveredvp != NULL) {
|
||||||
coveredvp->v_mountedhere = NULL;
|
coveredvp->v_mountedhere = NULL;
|
||||||
vput(coveredvp);
|
vput(coveredvp);
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
#include <sys/lock.h>
|
#include <sys/lock.h>
|
||||||
#include <sys/lockmgr.h>
|
#include <sys/lockmgr.h>
|
||||||
#include <sys/_mutex.h>
|
#include <sys/_mutex.h>
|
||||||
#include <sys/eventhandler.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -798,17 +797,6 @@ vfs_statfs_t __vfs_statfs;
|
|||||||
|
|
||||||
extern char *mountrootfsname;
|
extern char *mountrootfsname;
|
||||||
|
|
||||||
/*
|
|
||||||
* Event handlers
|
|
||||||
*/
|
|
||||||
|
|
||||||
typedef void (*vfs_mounted_notify_fn)(void *, struct mount *, struct vnode *,
|
|
||||||
struct thread *);
|
|
||||||
typedef void (*vfs_unmounted_notify_fn)(void *, struct mount *,
|
|
||||||
struct thread *);
|
|
||||||
EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn);
|
|
||||||
EVENTHANDLER_DECLARE(vfs_unmounted, vfs_unmounted_notify_fn);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* exported vnode operations
|
* exported vnode operations
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user