Deleted Added
sdiff udiff text old ( 112370 ) new ( 112552 )
full compact
geom.h (112370) geom.h (112552)
1/*-
2 * Copyright (c) 2002 Poul-Henning Kamp
3 * Copyright (c) 2002 Networks Associates Technology, Inc.
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp
7 * and NAI Labs, the Security Research Division of Network Associates, Inc.
8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the

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

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
1/*-
2 * Copyright (c) 2002 Poul-Henning Kamp
3 * Copyright (c) 2002 Networks Associates Technology, Inc.
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp
7 * and NAI Labs, the Security Research Division of Network Associates, Inc.
8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the

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

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * $FreeBSD: head/sys/geom/geom.h 112370 2003-03-18 09:42:33Z phk $
35 * $FreeBSD: head/sys/geom/geom.h 112552 2003-03-24 19:30:15Z phk $
36 */
37
38#ifndef _GEOM_GEOM_H_
39#define _GEOM_GEOM_H_
40
41#include <sys/lock.h>
42#include <sys/mutex.h>
43#include <sys/sx.h>

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

95 * the G_CLASS_INITIALIZER macro to initialize them.
96 */
97 LIST_ENTRY(g_class) class;
98 LIST_HEAD(,g_geom) geom;
99 struct g_event *event;
100 u_int protect;
101};
102
36 */
37
38#ifndef _GEOM_GEOM_H_
39#define _GEOM_GEOM_H_
40
41#include <sys/lock.h>
42#include <sys/mutex.h>
43#include <sys/sx.h>

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

95 * the G_CLASS_INITIALIZER macro to initialize them.
96 */
97 LIST_ENTRY(g_class) class;
98 LIST_HEAD(,g_geom) geom;
99 struct g_event *event;
100 u_int protect;
101};
102
103#define G_CLASS_INITIALIZER { 0, 0 }, { 0 }, 0, 0
103#define G_CLASS_INITIALIZER \
104 .class = { 0, 0 }, \
105 .geom = { 0 }, \
106 .event = 0, \
107 .protect = 0
104
105/*
106 * The g_geom is an instance of a g_class.
107 */
108struct g_geom {
109 u_int protect;
110 char *name;
111 struct g_class *class;

--- 325 unchanged lines hidden --- 		108
109/*
110 * The g_geom is an instance of a g_class.
111 */
112struct g_geom {
113 u_int protect;
114 char *name;
115 struct g_class *class;

--- 325 unchanged lines hidden ---