From owner-svn-src-projects@FreeBSD.ORG Thu Sep 24 02:15:05 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DEA6106566B; Thu, 24 Sep 2009 02:15:05 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 632448FC15; Thu, 24 Sep 2009 02:15:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8O2F5Mn080626; Thu, 24 Sep 2009 02:15:05 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8O2F5th080624; Thu, 24 Sep 2009 02:15:05 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200909240215.n8O2F5th080624@svn.freebsd.org> From: Lawrence Stewart Date: Thu, 24 Sep 2009 02:15:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197448 - projects/tcp_ffcaia2008_8.x/sys/kern X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2009 02:15:05 -0000 Author: lstewart Date: Thu Sep 24 02:15:05 2009 New Revision: 197448 URL: http://svn.freebsd.org/changeset/base/197448 Log: Remove cruft that was required to allow ALQ to compile and run on FreeBSD 6, 7 and 8. Any MFC of the new ALQ work will require changes to the code that replicate the relevant chunks of what this commit removes. Sponsored by: FreeBSD Foundation Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Modified: projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c ============================================================================== --- projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Thu Sep 24 01:58:29 2009 (r197447) +++ projects/tcp_ffcaia2008_8.x/sys/kern/kern_alq.c Thu Sep 24 02:15:05 2009 (r197448) @@ -46,9 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if (__FreeBSD_version >= 700000) #include -#endif /* Async. Logging Queue */ struct alq { @@ -189,11 +187,7 @@ ald_daemon(void) for (;;) { while ((alq = LIST_FIRST(&ald_active)) == NULL && !ald_shutingdown) -#if (__FreeBSD_version >= 700000) mtx_sleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0); -#else - msleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0); -#endif /* Don't shutdown until all active alq's are flushed */ if (ald_shutingdown && alq == NULL) { @@ -211,14 +205,7 @@ ald_daemon(void) ALD_LOCK(); } -#if (__FreeBSD_version < 800000) -#if (__FreeBSD_version < 700000) - wakeup(ald_proc); -#endif - kthread_exit(0); -#else kproc_exit(0); -#endif } static void @@ -248,11 +235,8 @@ ald_shutdown(void *arg, int howto) wakeup(&ald_active); /* Wait for ald_daemon to exit */ -#if (__FreeBSD_version >= 700000) mtx_sleep(ald_proc, &ald_mtx, PWAIT, "aldslp", 0); -#else - msleep(ald_proc, &ald_mtx, PWAIT, "aldslp", 0); -#endif + ALD_UNLOCK(); } @@ -359,11 +343,7 @@ alq_doio(struct alq *alq) */ vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_start_write(vp, &mp, V_WAIT); -#if (__FreeBSD_version < 800000) - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); -#else vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); -#endif /* * XXX: VOP_WRITE error checks are ignored. @@ -372,11 +352,7 @@ alq_doio(struct alq *alq) if (mac_vnode_check_write(alq->aq_cred, NOCRED, vp) == 0) #endif VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, alq->aq_cred); -#if (__FreeBSD_version < 800000) - VOP_UNLOCK(vp, 0, td); -#else VOP_UNLOCK(vp, 0); -#endif vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); @@ -450,24 +426,14 @@ alq_open(struct alq **alqp, const char * NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, file, td); flags = FWRITE | O_NOFOLLOW | O_CREAT; -#if (__FreeBSD_version < 700000) - error = vn_open_cred(&nd, &flags, cmode, cred, 0); -#elif (__FreeBSD_version < 800098) - error = vn_open_cred(&nd, &flags, cmode, cred, NULL); -#else error = vn_open_cred(&nd, &flags, cmode, 0, cred, NULL); -#endif if (error) return (error); vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); /* We just unlock so we hold a reference. */ -#if (__FreeBSD_version < 800000) - VOP_UNLOCK(nd.ni_vp, 0, td); -#else VOP_UNLOCK(nd.ni_vp, 0); -#endif VFS_UNLOCK_GIANT(vfslocked); alq = malloc(sizeof(*alq), M_ALD, M_WAITOK|M_ZERO);