svn commit: r251604 - in head/sys: kern sys
Marcel Moolenaar
marcel at FreeBSD.org
Mon Jun 10 15:22:28 UTC 2013
Author: marcel
Date: Mon Jun 10 15:22:27 2013
New Revision: 251604
URL: http://svnweb.freebsd.org/changeset/base/251604
Log:
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.
Modified:
head/sys/kern/vfs_mount.c
head/sys/sys/mount.h
Modified: head/sys/kern/vfs_mount.c
==============================================================================
--- head/sys/kern/vfs_mount.c Mon Jun 10 14:22:04 2013 (r251603)
+++ head/sys/kern/vfs_mount.c Mon Jun 10 15:22:27 2013 (r251604)
@@ -864,7 +864,6 @@ vfs_domount_first(
VOP_UNLOCK(newdp, 0);
VOP_UNLOCK(vp, 0);
mountcheckdirs(vp, newdp);
- EVENTHANDLER_INVOKE(vfs_mounted, mp, newdp, td);
vrele(newdp);
if ((mp->mnt_flag & MNT_RDONLY) == 0)
vfs_allocate_syncvnode(mp);
@@ -1356,7 +1355,6 @@ dounmount(mp, flags, td)
mtx_lock(&mountlist_mtx);
TAILQ_REMOVE(&mountlist, mp, mnt_list);
mtx_unlock(&mountlist_mtx);
- EVENTHANDLER_INVOKE(vfs_unmounted, mp, td);
if (coveredvp != NULL) {
coveredvp->v_mountedhere = NULL;
vput(coveredvp);
Modified: head/sys/sys/mount.h
==============================================================================
--- head/sys/sys/mount.h Mon Jun 10 14:22:04 2013 (r251603)
+++ head/sys/sys/mount.h Mon Jun 10 15:22:27 2013 (r251604)
@@ -39,7 +39,6 @@
#include <sys/lock.h>
#include <sys/lockmgr.h>
#include <sys/_mutex.h>
-#include <sys/eventhandler.h>
#endif
/*
@@ -799,17 +798,6 @@ vfs_statfs_t __vfs_statfs;
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
*/
More information about the svn-src-head
mailing list