From 4612275fdb06cfcc6269cbeac8e0a622b8096f61 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Mon, 10 Jun 2013 15:22:27 +0000 Subject: [PATCH] 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. --- sys/kern/vfs_mount.c | 2 -- sys/sys/mount.h | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 2e5d12f02f74..448fdbbbfc6c 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -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); diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 2938e32bead2..a953dae420cd 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -39,7 +39,6 @@ #include #include #include -#include #endif /* @@ -798,17 +797,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 */