From owner-svn-src-all@FreeBSD.ORG Mon Jun 10 15:22:28 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4F39E63F; Mon, 10 Jun 2013 15:22:28 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 401AB1E6E; Mon, 10 Jun 2013 15:22:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5AFMSWt023303; Mon, 10 Jun 2013 15:22:28 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5AFMRwR023301; Mon, 10 Jun 2013 15:22:27 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201306101522.r5AFMRwR023301@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 10 Jun 2013 15:22:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251604 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2013 15:22:28 -0000 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 #include #include -#include #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 */