From owner-svn-src-all@FreeBSD.ORG Sat Nov 28 11:57:44 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06FD61065703; Sat, 28 Nov 2009 11:57:44 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E9C3E8FC1C; Sat, 28 Nov 2009 11:57:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nASBvhr7053656; Sat, 28 Nov 2009 11:57:43 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nASBvhYV053646; Sat, 28 Nov 2009 11:57:43 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <200911281157.nASBvhYV053646@svn.freebsd.org> From: Edward Tomasz Napierala Date: Sat, 28 Nov 2009 11:57:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199875 - head/sys/geom/label X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Nov 2009 11:57:44 -0000 Author: trasz Date: Sat Nov 28 11:57:43 2009 New Revision: 199875 URL: http://svn.freebsd.org/changeset/base/199875 Log: Provide a set of sysctls and tunables to disable device node creation for specific "kinds" of disk labels - for example, GPT UUIDs. Reason for this is that sometimes, other GEOM classes attach to these device nodes instead of the proper ones - e.g. they attach to /dev/gptid/XXX instead of /dev/ada0p2, which is annoying. Reviewed by: pjd (earlier version) MFC after: 1 month Modified: head/sys/geom/label/g_label.c head/sys/geom/label/g_label.h head/sys/geom/label/g_label_ext2fs.c head/sys/geom/label/g_label_gpt.c head/sys/geom/label/g_label_iso9660.c head/sys/geom/label/g_label_msdosfs.c head/sys/geom/label/g_label_ntfs.c head/sys/geom/label/g_label_reiserfs.c head/sys/geom/label/g_label_ufs.c Modified: head/sys/geom/label/g_label.c ============================================================================== --- head/sys/geom/label/g_label.c Sat Nov 28 11:57:25 2009 (r199874) +++ head/sys/geom/label/g_label.c Sat Nov 28 11:57:43 2009 (r199875) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -316,6 +315,8 @@ g_label_taste(struct g_class *mp, struct for (i = 0; g_labels[i] != NULL; i++) { char label[64]; + if (g_labels[i]->ld_enabled == 0) + continue; g_topology_unlock(); g_labels[i]->ld_taste(cp, label, sizeof(label)); g_topology_lock(); Modified: head/sys/geom/label/g_label.h ============================================================================== --- head/sys/geom/label/g_label.h Sat Nov 28 11:57:25 2009 (r199874) +++ head/sys/geom/label/g_label.h Sat Nov 28 11:57:43 2009 (r199875) @@ -30,6 +30,9 @@ #define _G_LABEL_H_ #include +#ifdef _KERNEL +#include +#endif #define G_LABEL_CLASS_NAME "LABEL" @@ -56,23 +59,34 @@ extern u_int g_label_debug; } \ } while (0) +SYSCTL_DECL(_kern_geom_label); + +#define G_LABEL_INIT(kind, label, descr) \ + SYSCTL_NODE(_kern_geom_label, OID_AUTO, kind, CTLFLAG_RD, \ + NULL, ""); \ + SYSCTL_INT(_kern_geom_label_##kind, OID_AUTO, enable, \ + CTLFLAG_RW, &label.ld_enabled, 1, descr); \ + TUNABLE_INT("kern.geom.label." __XSTRING(kind) ".enable", \ + &label.ld_enabled) + typedef void g_label_taste_t (struct g_consumer *cp, char *label, size_t size); struct g_label_desc { g_label_taste_t *ld_taste; char *ld_dir; + int ld_enabled; }; /* Supported labels. */ -extern const struct g_label_desc g_label_ufs_id; -extern const struct g_label_desc g_label_ufs_volume; -extern const struct g_label_desc g_label_iso9660; -extern const struct g_label_desc g_label_msdosfs; -extern const struct g_label_desc g_label_ext2fs; -extern const struct g_label_desc g_label_reiserfs; -extern const struct g_label_desc g_label_ntfs; -extern const struct g_label_desc g_label_gpt; -extern const struct g_label_desc g_label_gpt_uuid; +extern struct g_label_desc g_label_ufs_id; +extern struct g_label_desc g_label_ufs_volume; +extern struct g_label_desc g_label_iso9660; +extern struct g_label_desc g_label_msdosfs; +extern struct g_label_desc g_label_ext2fs; +extern struct g_label_desc g_label_reiserfs; +extern struct g_label_desc g_label_ntfs; +extern struct g_label_desc g_label_gpt; +extern struct g_label_desc g_label_gpt_uuid; #endif /* _KERNEL */ struct g_label_metadata { Modified: head/sys/geom/label/g_label_ext2fs.c ============================================================================== --- head/sys/geom/label/g_label_ext2fs.c Sat Nov 28 11:57:25 2009 (r199874) +++ head/sys/geom/label/g_label_ext2fs.c Sat Nov 28 11:57:43 2009 (r199875) @@ -86,7 +86,10 @@ exit_free: g_free(fs); } -const struct g_label_desc g_label_ext2fs = { +struct g_label_desc g_label_ext2fs = { .ld_taste = g_label_ext2fs_taste, - .ld_dir = "ext2fs" + .ld_dir = "ext2fs", + .ld_enabled = 1 }; + +G_LABEL_INIT(ext2fs, g_label_ext2fs, "Create device nodes for EXT2FS volumes"); Modified: head/sys/geom/label/g_label_gpt.c ============================================================================== --- head/sys/geom/label/g_label_gpt.c Sat Nov 28 11:57:25 2009 (r199874) +++ head/sys/geom/label/g_label_gpt.c Sat Nov 28 11:57:43 2009 (r199875) @@ -153,12 +153,17 @@ g_label_gpt_uuid_taste(struct g_consumer snprintf_uuid(label, size, &part_gpt_entry->ent.ent_uuid); } -const struct g_label_desc g_label_gpt = { +struct g_label_desc g_label_gpt = { .ld_taste = g_label_gpt_taste, - .ld_dir = G_LABEL_GPT_VOLUME_DIR + .ld_dir = G_LABEL_GPT_VOLUME_DIR, + .ld_enabled = 1 }; -const struct g_label_desc g_label_gpt_uuid = { +struct g_label_desc g_label_gpt_uuid = { .ld_taste = g_label_gpt_uuid_taste, - .ld_dir = G_LABEL_GPT_ID_DIR + .ld_dir = G_LABEL_GPT_ID_DIR, + .ld_enabled = 1 }; + +G_LABEL_INIT(gpt, g_label_gpt, "Create device nodes for GPT labels"); +G_LABEL_INIT(gptid, g_label_gpt_uuid, "Create device nodes for GPT UUIDs"); Modified: head/sys/geom/label/g_label_iso9660.c ============================================================================== --- head/sys/geom/label/g_label_iso9660.c Sat Nov 28 11:57:25 2009 (r199874) +++ head/sys/geom/label/g_label_iso9660.c Sat Nov 28 11:57:43 2009 (r199875) @@ -78,7 +78,10 @@ g_label_iso9660_taste(struct g_consumer } } -const struct g_label_desc g_label_iso9660 = { +struct g_label_desc g_label_iso9660 = { .ld_taste = g_label_iso9660_taste, - .ld_dir = G_LABEL_ISO9660_DIR + .ld_dir = G_LABEL_ISO9660_DIR, + .ld_enabled = 1 }; + +G_LABEL_INIT(iso9660, g_label_iso9660, "Create device nodes for ISO9660 volume names"); Modified: head/sys/geom/label/g_label_msdosfs.c ============================================================================== --- head/sys/geom/label/g_label_msdosfs.c Sat Nov 28 11:57:25 2009 (r199874) +++ head/sys/geom/label/g_label_msdosfs.c Sat Nov 28 11:57:43 2009 (r199875) @@ -216,7 +216,10 @@ error: g_free(sector); } -const struct g_label_desc g_label_msdosfs = { +struct g_label_desc g_label_msdosfs = { .ld_taste = g_label_msdosfs_taste, - .ld_dir = G_LABEL_MSDOSFS_DIR + .ld_dir = G_LABEL_MSDOSFS_DIR, + .ld_enabled = 1 }; + +G_LABEL_INIT(msdosfs, g_label_msdosfs, "Create device nodes for MSDOSFS volumes"); Modified: head/sys/geom/label/g_label_ntfs.c ============================================================================== --- head/sys/geom/label/g_label_ntfs.c Sat Nov 28 11:57:25 2009 (r199874) +++ head/sys/geom/label/g_label_ntfs.c Sat Nov 28 11:57:43 2009 (r199875) @@ -114,7 +114,10 @@ done: g_free(filerecp); } -const struct g_label_desc g_label_ntfs = { +struct g_label_desc g_label_ntfs = { .ld_taste = g_label_ntfs_taste, - .ld_dir = G_LABEL_NTFS_DIR + .ld_dir = G_LABEL_NTFS_DIR, + .ld_enabled = 1 }; + +G_LABEL_INIT(ntfs, g_label_ntfs, "Create device nodes for NTFS volumes"); Modified: head/sys/geom/label/g_label_reiserfs.c ============================================================================== --- head/sys/geom/label/g_label_reiserfs.c Sat Nov 28 11:57:25 2009 (r199874) +++ head/sys/geom/label/g_label_reiserfs.c Sat Nov 28 11:57:43 2009 (r199875) @@ -111,7 +111,10 @@ exit_free: g_free(fs); } -const struct g_label_desc g_label_reiserfs = { +struct g_label_desc g_label_reiserfs = { .ld_taste = g_label_reiserfs_taste, - .ld_dir = "reiserfs" + .ld_dir = "reiserfs", + .ld_enabled = 1 }; + +G_LABEL_INIT(reiserfs, g_label_reiserfs, "Create device nodes for REISERFS volumes"); Modified: head/sys/geom/label/g_label_ufs.c ============================================================================== --- head/sys/geom/label/g_label_ufs.c Sat Nov 28 11:57:25 2009 (r199874) +++ head/sys/geom/label/g_label_ufs.c Sat Nov 28 11:57:43 2009 (r199875) @@ -137,13 +137,17 @@ g_label_ufs_id_taste(struct g_consumer * g_label_ufs_taste_common(cp, label, size, G_LABEL_UFS_ID); } - -const struct g_label_desc g_label_ufs_volume = { +struct g_label_desc g_label_ufs_volume = { .ld_taste = g_label_ufs_volume_taste, - .ld_dir = G_LABEL_UFS_VOLUME_DIR + .ld_dir = G_LABEL_UFS_VOLUME_DIR, + .ld_enabled = 1 }; -const struct g_label_desc g_label_ufs_id = { +struct g_label_desc g_label_ufs_id = { .ld_taste = g_label_ufs_id_taste, - .ld_dir = G_LABEL_UFS_ID_DIR + .ld_dir = G_LABEL_UFS_ID_DIR, + .ld_enabled = 1 }; + +G_LABEL_INIT(ufsid, g_label_ufs_id, "Create device nodes for UFS file system IDs"); +G_LABEL_INIT(ufs, g_label_ufs_volume, "Create device nodes for UFS volume names");