Deleted Added
full compact
geom.h (104195) geom.h (104602)
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 104195 2002-09-30 08:54:46Z phk $
35 * $FreeBSD: head/sys/geom/geom.h 104602 2002-10-07 06:25:26Z 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>

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

220void g_io_request(struct bio *bp, struct g_consumer *cp);
221int g_io_setattr(const char *attr, struct g_consumer *cp, int len, void *ptr);
222struct bio *g_new_bio(void);
223void * g_read_data(struct g_consumer *cp, off_t offset, off_t length, int *error);
224int g_write_data(struct g_consumer *cp, off_t offset, void *ptr, off_t length);
225
226/* geom_kern.c / geom_kernsim.c */
227
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>

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

220void g_io_request(struct bio *bp, struct g_consumer *cp);
221int g_io_setattr(const char *attr, struct g_consumer *cp, int len, void *ptr);
222struct bio *g_new_bio(void);
223void * g_read_data(struct g_consumer *cp, off_t offset, off_t length, int *error);
224int g_write_data(struct g_consumer *cp, off_t offset, void *ptr, off_t length);
225
226/* geom_kern.c / geom_kernsim.c */
227
228#ifndef _SYS_CONF_H_
229typedef int d_ioctl_t(dev_t dev, u_long cmd, caddr_t data,
230 int fflag, struct thread *td);
231#endif
232
228struct g_ioctl {
229 u_long cmd;
230 void *data;
231 int fflag;
232 struct thread *td;
233struct g_ioctl {
234 u_long cmd;
235 void *data;
236 int fflag;
237 struct thread *td;
238 d_ioctl_t *func;
239 dev_t dev;
233};
234
235#ifdef _KERNEL
236
237struct g_kerneldump {
238 off_t offset;
239 off_t length;
240};

--- 67 unchanged lines hidden ---
240};
241
242#ifdef _KERNEL
243
244struct g_kerneldump {
245 off_t offset;
246 off_t length;
247};

--- 67 unchanged lines hidden ---