From owner-p4-projects@FreeBSD.ORG Mon Sep 22 19:54:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 212B4106567F; Mon, 22 Sep 2008 19:54:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFFB31065674 for ; Mon, 22 Sep 2008 19:54:49 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A4368FC23 for ; Mon, 22 Sep 2008 19:54:49 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8MJsmPb063468 for ; Mon, 22 Sep 2008 19:54:48 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8MJsm3q063458 for perforce@freebsd.org; Mon, 22 Sep 2008 19:54:48 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 22 Sep 2008 19:54:48 GMT Message-Id: <200809221954.m8MJsm3q063458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 150298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Sep 2008 19:54:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=150298 Change 150298 by ed@ed_dull on 2008/09/22 19:54:34 Reintegrate the TTY hooks layer, so I can generate sane diffs again. Affected files ... .. //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#42 integrate .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#25 integrate .. //depot/projects/mpsafetty/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/mpsafetty/sys/sys/tty.h#19 integrate .. //depot/projects/mpsafetty/sys/sys/ttydevsw.h#12 integrate .. //depot/projects/mpsafetty/sys/sys/ttydisc.h#11 integrate .. //depot/projects/mpsafetty/sys/sys/ttyhook.h#9 integrate Differences ... ==== //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.226 2008/09/11 15:28:28 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.227 2008/09/22 18:59:24 trasz Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -306,7 +306,7 @@ * than vn_open(). */ #ifdef MAC - error = mac_vnode_check_open(td->td_ucred, vp, FREAD); + error = mac_vnode_check_open(td->td_ucred, vp, VREAD); if (error) goto cleanup; #endif ==== //depot/projects/mpsafetty/sys/kern/tty.c#42 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.289 2008/09/16 14:57:23 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.290 2008/09/22 19:25:14 ed Exp $"); #include "opt_compat.h" ==== //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#25 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_ttydisc.c,v 1.4 2008/09/10 20:12:10 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_ttydisc.c,v 1.6 2008/09/22 19:25:14 ed Exp $"); #include #include ==== //depot/projects/mpsafetty/sys/netgraph/netgraph.h#2 (text+ko) ==== @@ -37,7 +37,7 @@ * * Author: Julian Elischer * - * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.74 2008/06/24 18:49:49 gnn Exp $ + * $FreeBSD: src/sys/netgraph/netgraph.h,v 1.75 2008/09/22 19:28:18 thompsa Exp $ * $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $ */ @@ -1130,6 +1130,7 @@ item_p ng_package_msg_self(node_p here, hook_p hook, struct ng_mesg *msg); void ng_replace_retaddr(node_p here, item_p item, ng_ID_t retaddr); int ng_rmhook_self(hook_p hook); /* if a node wants to kill a hook */ +int ng_rmnode_flags(node_p here, int flags); int ng_rmnode_self(node_p here); /* if a node wants to suicide */ int ng_rmtype(struct ng_type *tp); int ng_snd_item(item_p item, int queue); ==== //depot/projects/mpsafetty/sys/netgraph/ng_base.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ * Authors: Julian Elischer * Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.163 2008/09/13 09:17:02 mav Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.164 2008/09/22 19:28:18 thompsa Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -1507,7 +1507,7 @@ /* Shut this node down as soon as everyone is clear of it */ /* Should add arg "immediately" to jump the queue */ int -ng_rmnode_self(node_p node) +ng_rmnode_flags(node_p node, int flags) { int error; @@ -1517,10 +1517,16 @@ if (node->nd_flags & NGF_CLOSING) return (0); - error = ng_send_fn(node, NULL, &ng_rmnode, NULL, 0); + error = ng_send_fn1(node, NULL, &ng_rmnode, NULL, 0, flags); return (error); } +int +ng_rmnode_self(node_p node) +{ + return (ng_rmnode_flags(node, NG_NOFLAGS)); +} + static void ng_rmhook_part2(node_p node, hook_p hook, void *arg1, int arg2) { ==== //depot/projects/mpsafetty/sys/sys/tty.h#19 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/tty.h,v 1.107 2008/09/22 18:44:09 ed Exp $ + * $FreeBSD: src/sys/sys/tty.h,v 1.108 2008/09/22 19:25:14 ed Exp $ */ #ifndef _SYS_TTY_H_ ==== //depot/projects/mpsafetty/sys/sys/ttydevsw.h#12 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/ttydevsw.h,v 1.3 2008/09/22 18:44:09 ed Exp $ + * $FreeBSD: src/sys/sys/ttydevsw.h,v 1.4 2008/09/22 19:25:14 ed Exp $ */ #ifndef _SYS_TTYDEVSW_H_ ==== //depot/projects/mpsafetty/sys/sys/ttydisc.h#11 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/ttydisc.h,v 1.5 2008/09/22 18:44:09 ed Exp $ + * $FreeBSD: src/sys/sys/ttydisc.h,v 1.6 2008/09/22 19:25:14 ed Exp $ */ #ifndef _SYS_TTYDISC_H_ ==== //depot/projects/mpsafetty/sys/sys/ttyhook.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/sys/ttyhook.h,v 1.1 2008/09/22 19:25:14 ed Exp $ */ #ifndef _SYS_TTYHOOK_H_