| geom_disk.c (119660) | geom_disk.c (120374) |
|---|---|
| 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 --- 20 unchanged lines hidden (view full) --- 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 36#include <sys/cdefs.h> | 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 --- 20 unchanged lines hidden (view full) --- 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 36#include <sys/cdefs.h> |
| 37__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 119660 2003-09-01 20:45:32Z phk $"); | 37__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 120374 2003-09-23 07:53:59Z phk $"); |
| 38 39#include "opt_geom.h" 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> 44#include <sys/sysctl.h> 45#include <sys/bio.h> --- 248 unchanged lines hidden (view full) --- 294} 295 296static void 297g_disk_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g_consumer *cp, struct g_provider *pp) 298{ 299 struct disk *dp; 300 301 dp = gp->softc; | 38 39#include "opt_geom.h" 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> 44#include <sys/sysctl.h> 45#include <sys/bio.h> --- 248 unchanged lines hidden (view full) --- 294} 295 296static void 297g_disk_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g_consumer *cp, struct g_provider *pp) 298{ 299 struct disk *dp; 300 301 dp = gp->softc; |
| 302 if (dp == NULL) 303 return; |
|
| 302 if (indent == NULL) { 303 sbuf_printf(sb, " hd %u", dp->d_fwheads); 304 sbuf_printf(sb, " sc %u", dp->d_fwsectors); 305 return; 306 } 307 if (pp != NULL) { 308 sbuf_printf(sb, "%s<fwheads>%u</fwheads>\n", 309 indent, dp->d_fwheads); --- 51 unchanged lines hidden (view full) --- 361 dp->d_flags = flags; 362 KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy")); 363 KASSERT(dp->d_name != NULL, ("disk_create need d_name")); 364 KASSERT(*dp->d_name != 0, ("disk_create need d_name")); 365 KASSERT(strlen(dp->d_name) < SPECNAMELEN - 4, ("disk name too long")); 366 if (bootverbose || 1) 367 printf("GEOM: create disk %s%d dp=%p\n", 368 dp->d_name, dp->d_unit, dp); | 304 if (indent == NULL) { 305 sbuf_printf(sb, " hd %u", dp->d_fwheads); 306 sbuf_printf(sb, " sc %u", dp->d_fwsectors); 307 return; 308 } 309 if (pp != NULL) { 310 sbuf_printf(sb, "%s<fwheads>%u</fwheads>\n", 311 indent, dp->d_fwheads); --- 51 unchanged lines hidden (view full) --- 363 dp->d_flags = flags; 364 KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy")); 365 KASSERT(dp->d_name != NULL, ("disk_create need d_name")); 366 KASSERT(*dp->d_name != 0, ("disk_create need d_name")); 367 KASSERT(strlen(dp->d_name) < SPECNAMELEN - 4, ("disk name too long")); 368 if (bootverbose || 1) 369 printf("GEOM: create disk %s%d dp=%p\n", 370 dp->d_name, dp->d_unit, dp); |
| 369 dp->d_devstat = devstat_new_entry(dp->d_name, dp->d_unit, 370 dp->d_sectorsize, DEVSTAT_ALL_SUPPORTED, 371 DEVSTAT_TYPE_DIRECT, DEVSTAT_PRIORITY_MAX); | 371 if (dp->d_devstat == NULL) 372 dp->d_devstat = devstat_new_entry(dp->d_name, dp->d_unit, 373 dp->d_sectorsize, DEVSTAT_ALL_SUPPORTED, 374 DEVSTAT_TYPE_DIRECT, DEVSTAT_PRIORITY_MAX); |
| 372 dp->d_geom = NULL; 373 g_post_event(g_disk_create, dp, M_WAITOK, dp, NULL); 374} 375 376void 377disk_destroy(struct disk *dp) 378{ 379 struct g_geom *gp; --- 48 unchanged lines hidden --- | 375 dp->d_geom = NULL; 376 g_post_event(g_disk_create, dp, M_WAITOK, dp, NULL); 377} 378 379void 380disk_destroy(struct disk *dp) 381{ 382 struct g_geom *gp; --- 48 unchanged lines hidden --- |