Deleted Added
full compact
vnode.h (122091) vnode.h (122524)
1/*
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)vnode.h 8.7 (Berkeley) 2/4/94
1/*
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)vnode.h 8.7 (Berkeley) 2/4/94
34 * $FreeBSD: head/sys/sys/vnode.h 122091 2003-11-05 04:30:08Z kan $
34 * $FreeBSD: head/sys/sys/vnode.h 122524 2003-11-12 03:14:31Z rwatson $
35 */
36
37#ifndef _SYS_VNODE_H_
38#define _SYS_VNODE_H_
39
40/*
41 * XXX - compatability until lockmgr() goes away or all the #includes are
42 * updated.
43 */
44#include <sys/lockmgr.h>
45
46#include <sys/queue.h>
35 */
36
37#ifndef _SYS_VNODE_H_
38#define _SYS_VNODE_H_
39
40/*
41 * XXX - compatability until lockmgr() goes away or all the #includes are
42 * updated.
43 */
44#include <sys/lockmgr.h>
45
46#include <sys/queue.h>
47#include <sys/_label.h>
48#include <sys/_lock.h>
49#include <sys/lock.h>
50#include <sys/_mutex.h>
51#include <sys/mutex.h>
52#include <sys/selinfo.h>
53#include <sys/uio.h>
54#include <sys/acl.h>
55#include <sys/ktr.h>

--- 92 unchanged lines hidden (view full) ---

148 vop_t **v_op; /* u vnode operations vector */
149 struct mount *v_mount; /* u ptr to vfs we are in */
150 LIST_HEAD(, namecache) v_cache_src; /* c Cache entries from us */
151 TAILQ_HEAD(, namecache) v_cache_dst; /* c Cache entries to us */
152 u_long v_id; /* c capability identifier */
153 struct vnode *v_dd; /* c .. vnode */
154 u_long v_ddid; /* c .. capability identifier */
155 struct vpollinfo *v_pollinfo; /* p Poll events */
47#include <sys/_lock.h>
48#include <sys/lock.h>
49#include <sys/_mutex.h>
50#include <sys/mutex.h>
51#include <sys/selinfo.h>
52#include <sys/uio.h>
53#include <sys/acl.h>
54#include <sys/ktr.h>

--- 92 unchanged lines hidden (view full) ---

147 vop_t **v_op; /* u vnode operations vector */
148 struct mount *v_mount; /* u ptr to vfs we are in */
149 LIST_HEAD(, namecache) v_cache_src; /* c Cache entries from us */
150 TAILQ_HEAD(, namecache) v_cache_dst; /* c Cache entries to us */
151 u_long v_id; /* c capability identifier */
152 struct vnode *v_dd; /* c .. vnode */
153 u_long v_ddid; /* c .. capability identifier */
154 struct vpollinfo *v_pollinfo; /* p Poll events */
156 struct label v_label; /* MAC label for vnode */
155 struct label *v_label; /* MAC label for vnode */
157#ifdef DEBUG_LOCKS
158 const char *filename; /* Source file doing locking */
159 int line; /* Line number doing locking */
160#endif
161 udev_t v_cachedfs; /* cached fs id */
162 ino_t v_cachedid; /* cached file id */
163};
164#define v_mountedhere v_un.vu_mountedhere

--- 563 unchanged lines hidden ---
156#ifdef DEBUG_LOCKS
157 const char *filename; /* Source file doing locking */
158 int line; /* Line number doing locking */
159#endif
160 udev_t v_cachedfs; /* cached fs id */
161 ino_t v_cachedid; /* cached file id */
162};
163#define v_mountedhere v_un.vu_mountedhere

--- 563 unchanged lines hidden ---