Deleted Added
full compact
diskmbr.h (103670) diskmbr.h (103675)
1/*
2 * Copyright (c) 1987, 1988, 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 * @(#)disklabel.h 8.2 (Berkeley) 7/10/94
1/*
2 * Copyright (c) 1987, 1988, 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 * @(#)disklabel.h 8.2 (Berkeley) 7/10/94
34 * $FreeBSD: head/sys/sys/diskmbr.h 103670 2002-09-20 09:31:14Z phk $
34 * $FreeBSD: head/sys/sys/diskmbr.h 103675 2002-09-20 12:52:03Z phk $
35 */
36
37#ifndef _SYS_DISKLABEL_H_
38#define _SYS_DISKLABEL_H_
39
40#ifndef _KERNEL
41#include <sys/types.h>
42#endif

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

390#define dkslice(dev) ((minor(dev) >> 16) & 0x1f)
391#define dksparebits(dev) ((minor(dev) >> 25) & 0x7f)
392
393struct bio;
394struct bio_queue_head;
395
396int bounds_check_with_label(struct bio *bp, struct disklabel *lp,
397 int wlabel);
35 */
36
37#ifndef _SYS_DISKLABEL_H_
38#define _SYS_DISKLABEL_H_
39
40#ifndef _KERNEL
41#include <sys/types.h>
42#endif

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

390#define dkslice(dev) ((minor(dev) >> 16) & 0x1f)
391#define dksparebits(dev) ((minor(dev) >> 25) & 0x7f)
392
393struct bio;
394struct bio_queue_head;
395
396int bounds_check_with_label(struct bio *bp, struct disklabel *lp,
397 int wlabel);
398void diskerr(struct bio *bp, char *what, int blkdone, struct disklabel *lp);
399dev_t dkmodpart(dev_t dev, int part);
400dev_t dkmodslice(dev_t dev, int slice);
401u_int dkunit(dev_t dev);
402char *readdisklabel(dev_t dev, struct disklabel *lp);
403void bioqdisksort(struct bio_queue_head *ap, struct bio *bp);
404int setdisklabel(struct disklabel *olp, struct disklabel *nlp,
405 u_long openmask);
406int writedisklabel(dev_t dev, struct disklabel *lp);

--- 15 unchanged lines hidden ---
398dev_t dkmodpart(dev_t dev, int part);
399dev_t dkmodslice(dev_t dev, int slice);
400u_int dkunit(dev_t dev);
401char *readdisklabel(dev_t dev, struct disklabel *lp);
402void bioqdisksort(struct bio_queue_head *ap, struct bio *bp);
403int setdisklabel(struct disklabel *olp, struct disklabel *nlp,
404 u_long openmask);
405int writedisklabel(dev_t dev, struct disklabel *lp);

--- 15 unchanged lines hidden ---