Index: g_label.c =================================================================== --- g_label.c (revision 190830) +++ g_label.c (working copy) @@ -104,7 +104,7 @@ g_label_orphan(struct g_consumer *cp) { - G_LABEL_DEBUG(0, "Label %s removed.", + G_LABEL_DEBUG(1, "Label %s removed.", LIST_FIRST(&cp->geom->provider)->name); g_slice_orphan(cp); } @@ -113,7 +113,7 @@ g_label_spoiled(struct g_consumer *cp) { - G_LABEL_DEBUG(0, "Label %s removed.", + G_LABEL_DEBUG(1, "Label %s removed.", LIST_FIRST(&cp->geom->provider)->name); g_slice_spoiled(cp); } @@ -147,9 +147,9 @@ g_topology_assert(); if (!g_label_is_name_ok(label)) { - G_LABEL_DEBUG(0, "%s contains suspicious label, skipping.", + G_LABEL_DEBUG(1, "%s contains suspicious label, skipping.", pp->name); - G_LABEL_DEBUG(1, "%s suspicious label is: %s", pp->name, label); + G_LABEL_DEBUG(10, "%s suspicious label is: %s", pp->name, label); return (NULL); } gp = NULL; @@ -160,7 +160,7 @@ if (pp2 == NULL) continue; if (strcmp(pp2->name, name) == 0) { - G_LABEL_DEBUG(1, "Label %s(%s) already exists (%s).", + G_LABEL_DEBUG(10, "Label %s(%s) already exists (%s).", label, name, pp->name); if (req != NULL) { gctl_error(req, "Provider %s already exists.", @@ -181,7 +181,7 @@ g_access(cp, -1, 0, 0); g_slice_config(gp, 0, G_SLICE_CONFIG_SET, (off_t)0, mediasize, pp->sectorsize, name); - G_LABEL_DEBUG(0, "Label for provider %s is %s.", pp->name, name); + G_LABEL_DEBUG(1, "Label for provider %s is %s.", pp->name, name); return (gp); } @@ -197,13 +197,13 @@ G_LABEL_DEBUG(0, "Provider %s is still open, so it " "can't be definitely removed.", pp->name); } else { - G_LABEL_DEBUG(1, + G_LABEL_DEBUG(10, "Provider %s is still open (r%dw%de%d).", pp->name, pp->acr, pp->acw, pp->ace); return (EBUSY); } } else { - G_LABEL_DEBUG(0, "Label %s removed.", + G_LABEL_DEBUG(1, "Label %s removed.", LIST_FIRST(&gp->provider)->name); } g_slice_spoiled(LIST_FIRST(&gp->consumer)); @@ -267,7 +267,7 @@ g_trace(G_T_TOPOLOGY, "%s(%s, %s)", __func__, mp->name, pp->name); g_topology_assert(); - G_LABEL_DEBUG(2, "Tasting %s.", pp->name); + G_LABEL_DEBUG(20, "Tasting %s.", pp->name); if (strcmp(pp->geom->class->name, mp->name) == 0) return (NULL); @@ -356,7 +356,7 @@ name += strlen("/dev/"); pp = g_provider_by_name(name); if (pp == NULL) { - G_LABEL_DEBUG(1, "Provider %s is invalid.", name); + G_LABEL_DEBUG(10, "Provider %s is invalid.", name); gctl_error(req, "Provider %s is invalid.", name); return; } @@ -442,7 +442,7 @@ } gp = g_label_find_geom(mp, name); if (gp == NULL) { - G_LABEL_DEBUG(1, "Label %s is invalid.", name); + G_LABEL_DEBUG(10, "Label %s is invalid.", name); gctl_error(req, "Label %s is invalid.", name); return; } Index: g_label_ext2fs.c =================================================================== --- g_label_ext2fs.c (revision 190830) +++ g_label_ext2fs.c (working copy) @@ -68,7 +68,7 @@ /* Check for magic and versio n*/ if (fs->s_magic == EXT2_SUPER_MAGIC && fs->s_rev_level == EXT2_DYNAMIC_REV) { - G_LABEL_DEBUG(1, "ext2fs file system detected on %s.", + G_LABEL_DEBUG(10, "ext2fs file system detected on %s.", pp->name); } else { goto exit_free; Index: g_label_iso9660.c =================================================================== --- g_label_iso9660.c (revision 190830) +++ g_label_iso9660.c (working copy) @@ -63,7 +63,7 @@ g_free(sector); return; } - G_LABEL_DEBUG(1, "ISO9660 file system detected on %s.", pp->name); + G_LABEL_DEBUG(10, "ISO9660 file system detected on %s.", pp->name); volume = sector + 0x28; bzero(label, size); strlcpy(label, volume, MIN(size, VOLUME_LEN)); Index: g_label_msdosfs.c =================================================================== --- g_label_msdosfs.c (revision 190830) +++ g_label_msdosfs.c (working copy) @@ -64,7 +64,7 @@ case 4096: break; default: - G_LABEL_DEBUG(1, "MSDOSFS: %s: sector size %d not compatible.", + G_LABEL_DEBUG(20, "MSDOSFS: %s: sector size %d not compatible.", pp->name, pp->sectorsize); return; } @@ -76,7 +76,7 @@ /* Check for the FAT boot sector signature. */ if (sector0[510] != 0x55 || sector0[511] != 0xaa) { - G_LABEL_DEBUG(1, "MSDOSFS: %s: no FAT signature found.", + G_LABEL_DEBUG(20, "MSDOSFS: %s: no FAT signature found.", pp->name); goto error; } @@ -95,18 +95,18 @@ * at the right place, this should be a FAT12 or FAT16 volume. */ if (strncmp(pfat_bsbpb->BS_FilSysType, "FAT", 3) != 0) { - G_LABEL_DEBUG(1, + G_LABEL_DEBUG(20, "MSDOSFS: %s: FAT12/16 volume not valid.", pp->name); goto error; } - G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT12/FAT16 volume detected.", + G_LABEL_DEBUG(10, "MSDOSFS: %s: FAT12/FAT16 volume detected.", pp->name); /* A volume with no name should have "NO NAME " as label. */ if (strncmp(pfat_bsbpb->BS_VolLab, LABEL_NO_NAME, sizeof(pfat_bsbpb->BS_VolLab)) == 0) { - G_LABEL_DEBUG(1, + G_LABEL_DEBUG(10, "MSDOSFS: %s: FAT12/16 volume has no name.", pp->name); goto error; @@ -121,11 +121,11 @@ * at the right place, this should be a FAT32 volume. */ if (strncmp(pfat32_bsbpb->BS_FilSysType, "FAT", 3) != 0) { - G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT32 volume not valid.", + G_LABEL_DEBUG(20, "MSDOSFS: %s: FAT32 volume not valid.", pp->name); goto error; } - G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT32 volume detected.", + G_LABEL_DEBUG(10, "MSDOSFS: %s: FAT32 volume detected.", pp->name); /* @@ -149,7 +149,7 @@ UINT32BYTES(pfat32_bsbpb->BPB_FATSz32)); fat_BytesPerSector = UINT16BYTES(pfat32_bsbpb->BPB_BytsPerSec); - G_LABEL_DEBUG(2, + G_LABEL_DEBUG(20, "MSDOSFS: FAT_FirstDataSector=0x%x, FAT_BytesPerSector=%d", fat_FirstDataSector, fat_BytesPerSector); @@ -164,7 +164,7 @@ do { /* No more entries available. */ if (pfat_entry->DIR_Name[0] == 0) { - G_LABEL_DEBUG(1, "MSDOSFS: %s: " + G_LABEL_DEBUG(20, "MSDOSFS: %s: " "FAT32 volume has no name.", pp->name); goto error; @@ -194,7 +194,7 @@ g_free(sector); } } else { - G_LABEL_DEBUG(1, "MSDOSFS: %s: no FAT volume detected.", + G_LABEL_DEBUG(20, "MSDOSFS: %s: no FAT volume detected.", pp->name); goto error; } Index: g_label_reiserfs.c =================================================================== --- g_label_reiserfs.c (revision 190830) +++ g_label_reiserfs.c (working copy) @@ -93,7 +93,7 @@ /* Check version */ if (fs->s_version == 2) { - G_LABEL_DEBUG(1, "reiserfs file system detected on %s.", + G_LABEL_DEBUG(10, "reiserfs file system detected on %s.", pp->name); } else { goto exit_free; Index: g_label_ufs.c =================================================================== --- g_label_ufs.c (revision 190830) +++ g_label_ufs.c (working copy) @@ -98,7 +98,7 @@ g_free(fs); continue; } - G_LABEL_DEBUG(1, "%s file system detected on %s.", + G_LABEL_DEBUG(10, "%s file system detected on %s.", fs->fs_magic == FS_UFS1_MAGIC ? "UFS1" : "UFS2", pp->name); switch (what) { case G_LABEL_UFS_VOLUME: