Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/sys/sys DTrace: remove file.h - it shoul...



details:   https://anonhg.NetBSD.org/src/rev/856e538d3a04
branches:  trunk
changeset: 752257:856e538d3a04
user:      darran <darran%NetBSD.org@localhost>
date:      Sun Feb 21 08:28:40 2010 +0000

description:
DTrace: remove file.h - it shouldn't have been added and breaks zfs.

diffstat:

 external/cddl/osnet/sys/sys/file.h |  59 --------------------------------------
 1 files changed, 0 insertions(+), 59 deletions(-)

diffs (63 lines):

diff -r 457bc9dd4142 -r 856e538d3a04 external/cddl/osnet/sys/sys/file.h
--- a/external/cddl/osnet/sys/sys/file.h        Sun Feb 21 07:39:18 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*     $NetBSD: file.h,v 1.2 2010/02/21 01:46:36 darran Exp $  */
-
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek <pjd%FreeBSD.org@localhost>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/file.h,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
- */
-
-#ifndef _OPENSOLARIS_SYS_FILE_H_
-#define        _OPENSOLARIS_SYS_FILE_H_
-
-#include_next <sys/file.h>
-
-#ifdef _KERNEL
-typedef        struct file     file_t;
-
-static __inline file_t *
-getf(int fd, int write)
-{
-       struct file *fp;
-
-       if (write && fget_write(curthread, fd, &fp) == 0)
-               return (fp);
-       else if (!write && fget_read(curthread, fd, &fp) == 0)
-               return (fp);
-       return (NULL);
-}
-
-static __inline void
-releasef(file_t *fp)
-{
-
-       fdrop(fp, curthread);
-}
-#endif /* _KERNEL */
-
-#endif /* !_OPENSOLARIS_SYS_FILE_H_ */



Home | Main Index | Thread Index | Old Index