Deleted Added
full compact
geom_disk.h (112988) geom_disk.h (125975)
1/*-
2 * Copyright (c) 2003 Poul-Henning Kamp
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Poul-Henning Kamp
6 * and NAI Labs, the Security Research Division of Network Associates, Inc.
7 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
8 * DARPA CHATS research program.

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

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

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

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $FreeBSD: head/sys/geom/geom_disk.h 112988 2003-04-02 20:41:18Z phk $
34 * $FreeBSD: head/sys/geom/geom_disk.h 125975 2004-02-18 21:36:53Z phk $
35 */
36
37#ifndef _GEOM_GEOM_DISK_H_
38#define _GEOM_GEOM_DISK_H_
39
40#ifdef _KERNEL
41
42#include <sys/queue.h>

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

52
53struct g_geom;
54struct devstat;
55
56struct disk {
57 /* Fields which are private to geom_disk */
58 struct g_geom *d_geom;
59 struct devstat *d_devstat;
35 */
36
37#ifndef _GEOM_GEOM_DISK_H_
38#define _GEOM_GEOM_DISK_H_
39
40#ifdef _KERNEL
41
42#include <sys/queue.h>

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

52
53struct g_geom;
54struct devstat;
55
56struct disk {
57 /* Fields which are private to geom_disk */
58 struct g_geom *d_geom;
59 struct devstat *d_devstat;
60 int d_destroyed;
60
61 /* Shared fields */
62 u_int d_flags;
63 const char *d_name;
64 u_int d_unit;
65 struct bio_queue_head *d_queue;
66 struct mtx *d_lock;
67

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

80 u_int d_maxsize;
81 u_int d_stripeoffset;
82 u_int d_stripesize;
83
84 /* Fields private to the driver */
85 void *d_drv1;
86};
87
61
62 /* Shared fields */
63 u_int d_flags;
64 const char *d_name;
65 u_int d_unit;
66 struct bio_queue_head *d_queue;
67 struct mtx *d_lock;
68

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

81 u_int d_maxsize;
82 u_int d_stripeoffset;
83 u_int d_stripesize;
84
85 /* Fields private to the driver */
86 void *d_drv1;
87};
88
88#define DISKFLAG_NOGIANT 0x1
89#define DISKFLAG_NEEDSGIANT 0x1
89#define DISKFLAG_OPEN 0x2
90#define DISKFLAG_CANDELETE 0x4
91
90#define DISKFLAG_OPEN 0x2
91#define DISKFLAG_CANDELETE 0x4
92
92void disk_create(int unit, struct disk *disk, int flags, void *unused, void *unused2);
93struct disk *disk_alloc(void);
94void disk_create(struct disk *disk, int version);
93void disk_destroy(struct disk *disk);
94
95void disk_destroy(struct disk *disk);
96
97#define DISK_VERSION_00 0x58561059
98#define DISK_VERSION DISK_VERSION_00
95
96#endif /* _KERNEL */
97#endif /* _GEOM_GEOM_DISK_H_ */
99
100#endif /* _KERNEL */
101#endif /* _GEOM_GEOM_DISK_H_ */