| subr_disk.c (104507) | subr_disk.c (104519) |
|---|---|
| 1/* 2 * ---------------------------------------------------------------------------- 3 * "THE BEER-WARE LICENSE" (Revision 42): 4 * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you 5 * can do whatever you want with this stuff. If we meet some day, and you think 6 * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp 7 * ---------------------------------------------------------------------------- 8 * | 1/* 2 * ---------------------------------------------------------------------------- 3 * "THE BEER-WARE LICENSE" (Revision 42): 4 * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you 5 * can do whatever you want with this stuff. If we meet some day, and you think 6 * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp 7 * ---------------------------------------------------------------------------- 8 * |
| 9 * $FreeBSD: head/sys/kern/subr_disk.c 104507 2002-10-05 11:24:21Z brian $ | 9 * $FreeBSD: head/sys/kern/subr_disk.c 104519 2002-10-05 16:35:33Z phk $ |
| 10 * 11 */ 12 13#include "opt_geom.h" 14 15#include <sys/param.h> 16#include <sys/systm.h> 17#include <sys/stdint.h> 18#include <sys/bio.h> 19#include <sys/conf.h> 20#include <sys/disk.h> 21#include <sys/diskslice.h> 22#include <sys/disklabel.h> | 10 * 11 */ 12 13#include "opt_geom.h" 14 15#include <sys/param.h> 16#include <sys/systm.h> 17#include <sys/stdint.h> 18#include <sys/bio.h> 19#include <sys/conf.h> 20#include <sys/disk.h> 21#include <sys/diskslice.h> 22#include <sys/disklabel.h> |
| 23#ifndef GEOM | 23#ifdef NO_GEOM |
| 24#include <sys/kernel.h> 25#include <sys/sysctl.h> 26#include <sys/malloc.h> 27#include <sys/sysctl.h> 28#include <machine/md_var.h> 29#include <sys/ctype.h> 30 31static MALLOC_DEFINE(M_DISK, "disk", "disk data"); --- 403 unchanged lines hidden (view full) --- 435 0, sizeof(struct disklabel), "sizeof(struct disklabel)"); 436 437SYSCTL_INT(_debug_sizeof, OID_AUTO, diskslices, CTLFLAG_RD, 438 0, sizeof(struct diskslices), "sizeof(struct diskslices)"); 439 440SYSCTL_INT(_debug_sizeof, OID_AUTO, disk, CTLFLAG_RD, 441 0, sizeof(struct disk), "sizeof(struct disk)"); 442 | 24#include <sys/kernel.h> 25#include <sys/sysctl.h> 26#include <sys/malloc.h> 27#include <sys/sysctl.h> 28#include <machine/md_var.h> 29#include <sys/ctype.h> 30 31static MALLOC_DEFINE(M_DISK, "disk", "disk data"); --- 403 unchanged lines hidden (view full) --- 435 0, sizeof(struct disklabel), "sizeof(struct disklabel)"); 436 437SYSCTL_INT(_debug_sizeof, OID_AUTO, diskslices, CTLFLAG_RD, 438 0, sizeof(struct diskslices), "sizeof(struct diskslices)"); 439 440SYSCTL_INT(_debug_sizeof, OID_AUTO, disk, CTLFLAG_RD, 441 0, sizeof(struct disk), "sizeof(struct disk)"); 442 |
| 443#endif | 443#endif /* NO_GEOM */ |
| 444 445/*- 446 * Disk error is the preface to plaintive error messages 447 * about failing disk transfers. It prints messages of the form 448 * "hp0g: BLABLABLA cmd=read fsbn 12345 of 12344-12347" 449 * blkdone should be -1 if the position of the error is unknown. 450 * The message is printed with printf. 451 */ --- 178 unchanged lines hidden --- | 444 445/*- 446 * Disk error is the preface to plaintive error messages 447 * about failing disk transfers. It prints messages of the form 448 * "hp0g: BLABLABLA cmd=read fsbn 12345 of 12344-12347" 449 * blkdone should be -1 if the position of the error is unknown. 450 * The message is printed with printf. 451 */ --- 178 unchanged lines hidden --- |