Deleted Added
full compact
geom.h (237518) geom.h (237545)
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 237518 2012-06-24 04:29:03Z ken $
35 * $FreeBSD: head/sys/geom/geom.h 237545 2012-06-25 04:26:10Z ken $
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>

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

98 g_fini_t *fini;
99 g_ctl_destroy_geom_t *destroy_geom;
100 /*
101 * Default values for geom methods
102 */
103 g_start_t *start;
104 g_spoiled_t *spoiled;
105 g_attrchanged_t *attrchanged;
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>

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

98 g_fini_t *fini;
99 g_ctl_destroy_geom_t *destroy_geom;
100 /*
101 * Default values for geom methods
102 */
103 g_start_t *start;
104 g_spoiled_t *spoiled;
105 g_attrchanged_t *attrchanged;
106 g_provgone_t *providergone;
107 g_dumpconf_t *dumpconf;
108 g_access_t *access;
109 g_orphan_t *orphan;
110 g_ioctl_t *ioctl;
106 g_dumpconf_t *dumpconf;
107 g_access_t *access;
108 g_orphan_t *orphan;
109 g_ioctl_t *ioctl;
111 void *spare1;
110 g_provgone_t *providergone;
112 void *spare2;
113 /*
114 * The remaining elements are private
115 */
116 LIST_ENTRY(g_class) class;
117 LIST_HEAD(,g_geom) geom;
118};
119

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

130 LIST_ENTRY(g_geom) geom;
131 LIST_HEAD(,g_consumer) consumer;
132 LIST_HEAD(,g_provider) provider;
133 TAILQ_ENTRY(g_geom) geoms; /* XXX: better name */
134 int rank;
135 g_start_t *start;
136 g_spoiled_t *spoiled;
137 g_attrchanged_t *attrchanged;
111 void *spare2;
112 /*
113 * The remaining elements are private
114 */
115 LIST_ENTRY(g_class) class;
116 LIST_HEAD(,g_geom) geom;
117};
118

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

129 LIST_ENTRY(g_geom) geom;
130 LIST_HEAD(,g_consumer) consumer;
131 LIST_HEAD(,g_provider) provider;
132 TAILQ_ENTRY(g_geom) geoms; /* XXX: better name */
133 int rank;
134 g_start_t *start;
135 g_spoiled_t *spoiled;
136 g_attrchanged_t *attrchanged;
138 g_provgone_t *providergone;
139 g_dumpconf_t *dumpconf;
140 g_access_t *access;
141 g_orphan_t *orphan;
142 g_ioctl_t *ioctl;
137 g_dumpconf_t *dumpconf;
138 g_access_t *access;
139 g_orphan_t *orphan;
140 g_ioctl_t *ioctl;
143 void *spare0;
141 g_provgone_t *providergone;
144 void *spare1;
145 void *softc;
146 unsigned flags;
147#define G_GEOM_WITHER 1
148#define G_GEOM_VOLATILE_BIO 2
149};
150
151/*

--- 248 unchanged lines hidden ---
142 void *spare1;
143 void *softc;
144 unsigned flags;
145#define G_GEOM_WITHER 1
146#define G_GEOM_VOLATILE_BIO 2
147};
148
149/*

--- 248 unchanged lines hidden ---