From owner-p4-projects@FreeBSD.ORG Mon Jun 14 10:59:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87128106567A; Mon, 14 Jun 2010 10:59:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B2A31065674 for ; Mon, 14 Jun 2010 10:59:39 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F3DCC8FC16 for ; Mon, 14 Jun 2010 10:59:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5EAxcWL095721 for ; Mon, 14 Jun 2010 10:59:38 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5EAxc9V095719 for perforce@freebsd.org; Mon, 14 Jun 2010 10:59:38 GMT (envelope-from kibab@FreeBSD.org) Date: Mon, 14 Jun 2010 10:59:38 GMT Message-Id: <201006141059.o5EAxc9V095719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2010 10:59:39 -0000 http://p4web.freebsd.org/@@179597?ac=10 Change 179597 by kibab@kibab_kibab-nb on 2010/06/14 10:59:15 - Finish adding FEATURE macro to main GEOM classes (main = has an option in conf/options to switch it on). Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/cache/g_cache.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_bsd.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_fox.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_mbr.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_pc98.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_sunlabel.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_vol_ffs.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/multipath/g_multipath.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_apm.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_bsd.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_ebr.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_gpt.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_mbr.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_pc98.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_vtoc8.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/raid3/g_raid3.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/shsec/g_shsec.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/stripe/g_stripe.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/uzip/g_uzip.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/virstor/g_virstor.c#2 edit Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/cache/g_cache.c#2 (text+ko) ==== @@ -42,6 +42,8 @@ #include #include +FEATURE(geom_cache, "Geom cache module"); + static MALLOC_DEFINE(M_GCACHE, "gcache_data", "GEOM_CACHE Data"); SYSCTL_DECL(_kern_geom); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_bsd.c#2 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -60,6 +61,8 @@ #include #include +FEATURE(geom_bsd, "Geom BSD disklabels support"); + #define BSD_CLASS_NAME "BSD" #define ALPHA_LABEL_OFFSET 64 ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_fox.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -52,6 +53,8 @@ #define FOX_CLASS_NAME "FOX" #define FOX_MAGIC "GEOM::FOX" +FEATURE(geom_fox, "Geom_fox redundant path mitigation support"); + struct g_fox_softc { off_t mediasize; u_int sectorsize; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_mbr.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +51,8 @@ #include #include +FEATURE(geom_mbr, "Geom DOS/MBR partitioning support"); + #define MBR_CLASS_NAME "MBR" #define MBREXT_CLASS_NAME "MBREXT" ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_pc98.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -47,6 +48,8 @@ #include #include +FEATURE(geom_pc98, "Geom NEC PC9800 partitioning support"); + #define PC98_CLASS_NAME "PC98" struct g_pc98_softc { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_sunlabel.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,8 @@ #include #include +FEATURE(geom_sunlabel, "Geom Sun/Solaris partitioning support"); + #define SUNLABEL_CLASS_NAME "SUN" struct g_sunlabel_softc { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_vol_ffs.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -42,6 +43,8 @@ #include #include +FEATURE(geom_vol, "Geom support for volume names from UFS superblok"); + #define VOL_FFS_CLASS_NAME "VOL_FFS" static int superblocks[] = SBLOCKSEARCH; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/multipath/g_multipath.c#2 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +FEATURE(geom_multipath, "Geom multipath support"); SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, multipath, CTLFLAG_RW, 0, ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_apm.c#2 (text+ko) ==== @@ -41,11 +41,14 @@ #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_apm, "Geom_part Apple partitioning support"); + struct g_part_apm_table { struct g_part_table base; struct apm_ddr ddr; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_bsd.c#2 (text+ko) ==== @@ -40,11 +40,14 @@ #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_bsd, "Geom_part BSD partitioning support"); + struct g_part_bsd_table { struct g_part_table base; u_char *bbarea; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_ebr.c#2 (text+ko) ==== @@ -42,11 +42,17 @@ #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_ebr, "Geom_part extended boot records support"); +#if defined(GEOM_PART_EBR_COMPAT) +FEATURE(geom_part_ebr_compat, "Geom_part extended boot records support: backward-compatible partition names"); +#endif + #define EBRSIZE 512 struct g_part_ebr_table { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_gpt.c#2 (text+ko) ==== @@ -41,12 +41,15 @@ #include #include #include +#include #include #include #include #include "g_part_if.h" +FEATURE(geom_part_gpt, "Geom_part GPT partitioning support"); + CTASSERT(offsetof(struct gpt_hdr, padding) == 92); CTASSERT(sizeof(struct gpt_ent) == 128); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_mbr.c#2 (text+ko) ==== @@ -40,11 +40,14 @@ #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_mbr, "Geom_part MBR partitioning support"); + #define MBRSIZE 512 struct g_part_mbr_table { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_pc98.c#2 (text+ko) ==== @@ -40,11 +40,14 @@ #include #include #include +#include #include #include #include "g_part_if.h" +FEATURE(geom_part_pc98, "Geom_part PC-9800 disk partitioning support"); + #define SECSIZE 512 struct g_part_pc98_table { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part_vtoc8.c#2 (text+ko) ==== @@ -39,12 +39,15 @@ #include #include #include +#include #include #include #include #include "g_part_if.h" +FEATURE(geom_part_vtoc8, "Geom_part SMI VTOC8 disk label support"); + struct g_part_vtoc8_table { struct g_part_table base; struct vtoc8 vtoc; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/raid3/g_raid3.c#2 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include +FEATURE(geom_raid3, "Geom RAID-3 functionality"); static MALLOC_DEFINE(M_RAID3, "raid3_data", "GEOM_RAID3 Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/shsec/g_shsec.c#2 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include +FEATURE(geom_shsec, "Geom shared secret device support"); static MALLOC_DEFINE(M_SHSEC, "shsec_data", "GEOM_SHSEC Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/stripe/g_stripe.c#2 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include +FEATURE(geom_stripe, "Geom striping support"); static MALLOC_DEFINE(M_STRIPE, "stripe_data", "GEOM_STRIPE Data"); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/uzip/g_uzip.c#2 (text+ko) ==== @@ -36,10 +36,13 @@ #include #include #include +#include #include #include +FEATURE(geom_uzip, "Geom_uzip read-only compressed disks support"); + #undef GEOM_UZIP_DEBUG #ifdef GEOM_UZIP_DEBUG #define DPRINTF(a) printf a ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/virstor/g_virstor.c#2 (text+ko) ==== @@ -52,6 +52,8 @@ #include #include +FEATURE(g_virstor, "Geom virtual storage support"); + /* Declare malloc(9) label */ static MALLOC_DEFINE(M_GVIRSTOR, "gvirstor", "GEOM_VIRSTOR Data");