Deleted Added
full compact
geom.h (157581) geom.h (157619)
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 157581 2006-04-07 16:19:48Z marcel $
35 * $FreeBSD: head/sys/geom/geom.h 157619 2006-04-10 03:55:13Z marcel $
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>

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

234struct g_geom * g_new_geomf(struct g_class *mp, const char *fmt, ...);
235struct g_provider * g_new_providerf(struct g_geom *gp, const char *fmt, ...);
236void g_spoil(struct g_provider *pp, struct g_consumer *cp);
237int g_std_access(struct g_provider *pp, int dr, int dw, int de);
238void g_std_done(struct bio *bp);
239void g_std_spoiled(struct g_consumer *cp);
240void g_wither_geom(struct g_geom *gp, int error);
241void g_wither_geom_close(struct g_geom *gp, int error);
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>

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

234struct g_geom * g_new_geomf(struct g_class *mp, const char *fmt, ...);
235struct g_provider * g_new_providerf(struct g_geom *gp, const char *fmt, ...);
236void g_spoil(struct g_provider *pp, struct g_consumer *cp);
237int g_std_access(struct g_provider *pp, int dr, int dw, int de);
238void g_std_done(struct bio *bp);
239void g_std_spoiled(struct g_consumer *cp);
240void g_wither_geom(struct g_geom *gp, int error);
241void g_wither_geom_close(struct g_geom *gp, int error);
242void g_wither_provider(struct g_provider *pp, int error);
242
243#ifdef DIAGNOSTIC
244int g_valid_obj(void const *ptr);
245#define G_VALID_CLASS(foo) \
246 KASSERT(g_valid_obj(foo) == 1, ("%p is not a g_class", foo))
247#define G_VALID_GEOM(foo) \
248 KASSERT(g_valid_obj(foo) == 2, ("%p is not a g_geom", foo))
249#define G_VALID_CONSUMER(foo) \

--- 100 unchanged lines hidden ---
243
244#ifdef DIAGNOSTIC
245int g_valid_obj(void const *ptr);
246#define G_VALID_CLASS(foo) \
247 KASSERT(g_valid_obj(foo) == 1, ("%p is not a g_class", foo))
248#define G_VALID_GEOM(foo) \
249 KASSERT(g_valid_obj(foo) == 2, ("%p is not a g_geom", foo))
250#define G_VALID_CONSUMER(foo) \

--- 100 unchanged lines hidden ---