Date: Wed, 25 May 2005 01:22:42 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 77433 for review Message-ID: <200505250122.j4P1Mfcs022819@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505250122.j4P1Mfcs022819>