From owner-p4-projects@FreeBSD.ORG  Wed May 25 01:22:43 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F268E16A420; Wed, 25 May 2005 01:22:42 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6DC3016A41C
	for <perforce@freebsd.org>; Wed, 25 May 2005 01:22:42 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4882743D48
	for <perforce@freebsd.org>; Wed, 25 May 2005 01:22:42 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4P1MgUe022822
	for <perforce@freebsd.org>; Wed, 25 May 2005 01:22:42 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4P1Mfcs022819
	for perforce@freebsd.org; Wed, 25 May 2005 01:22:42 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 25 May 2005 01:22:42 GMT
Message-Id: <200505250122.j4P1Mfcs022819@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 77433 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 May 2005 01:22:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=77433

Change 77433 by peter@peter_melody on 2005/05/25 01:21:41

	I am going to KILL phk for this.

Affected files ...

.. //depot/projects/hammer/sys/conf/options#74 edit
.. //depot/projects/hammer/sys/kern/sys_generic.c#23 edit

Differences ...

==== //depot/projects/hammer/sys/conf/options#74 (text+ko) ====

@@ -63,6 +63,7 @@
 CODA_COMPAT_5	opt_coda.h
 COMPAT_43	opt_compat.h
 COMPAT_FREEBSD4	opt_compat.h
+COMPAT_FREEBSD5	opt_compat.h
 COMPILING_LINT	opt_global.h
 CONSPEED	opt_comconsole.h
 CY_PCI_FASTINTR

==== //depot/projects/hammer/sys/kern/sys_generic.c#23 (text+ko) ====

@@ -37,6 +37,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/sys_generic.c,v 1.144 2005/03/31 22:51:18 jhb Exp $");
 
+#include "opt_compat.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
@@ -534,8 +535,12 @@
 	size = IOCPARM_LEN(com);
 	if ((size > IOCPARM_MAX) ||
 	    ((com & (IOC_VOID  | IOC_IN | IOC_OUT)) == 0) ||
-	    ((com & IOC_VOID) && size > 0) ||
-	    ((com & (IOC_IN | IOC_OUT)) && size == 0)) {
+#ifdef COMPAT_FREEBSD5
+	    ((com & IOC_OUT) && size == 0) ||
+#else
+	    ((com & (IOC_IN | IOC_OUT)) && size == 0) ||
+#endif
+	    ((com & IOC_VOID) && size > 0)) {
 		fdrop(fp, td);
 		return (ENOTTY);
 	}