diff options
author | ivoras <ivoras@FreeBSD.org> | 2009-03-25 20:38:57 +0000 |
---|---|---|
committer | ivoras <ivoras@FreeBSD.org> | 2009-03-25 20:38:57 +0000 |
commit | 5d32651d0fc935a18dfce90fdadbf6ea32e64c5d (patch) | |
tree | cdf093f1ff4587a2c33f5357e322cc7c765af9f6 /sys/geom/label | |
parent | a6bcdcc2b6019204155b0392148681ff641fafe2 (diff) | |
download | FreeBSD-src-5d32651d0fc935a18dfce90fdadbf6ea32e64c5d.zip FreeBSD-src-5d32651d0fc935a18dfce90fdadbf6ea32e64c5d.tar.gz |
Create GEOM labels from UFS IDs, e.g. /dev/ufsid/49c97b1faa2adc43. UFS IDs
are always present and can be used to identify file systems (useful if
hardware devices move often).
Actually-by: pjd
Approved by: gnn (mentor)
Diffstat (limited to 'sys/geom/label')
-rw-r--r-- | sys/geom/label/g_label.c | 3 | ||||
-rw-r--r-- | sys/geom/label/g_label.h | 3 | ||||
-rw-r--r-- | sys/geom/label/g_label_ufs.c | 56 |
3 files changed, 50 insertions, 12 deletions
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c index a6685e9..288489a 100644 --- a/sys/geom/label/g_label.c +++ b/sys/geom/label/g_label.c @@ -77,7 +77,8 @@ struct g_class g_label_class = { * 6. Add your file system to manual page sbin/geom/class/label/glabel.8. */ const struct g_label_desc *g_labels[] = { - &g_label_ufs, + &g_label_ufs_id, + &g_label_ufs_volume, &g_label_iso9660, &g_label_msdosfs, &g_label_ext2fs, diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h index e2d7a5e..e3541a9 100644 --- a/sys/geom/label/g_label.h +++ b/sys/geom/label/g_label.h @@ -64,7 +64,8 @@ struct g_label_desc { }; /* Supported labels. */ -extern const struct g_label_desc g_label_ufs; +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; diff --git a/sys/geom/label/g_label_ufs.c b/sys/geom/label/g_label_ufs.c index a1801d5..8510fc0 100644 --- a/sys/geom/label/g_label_ufs.c +++ b/sys/geom/label/g_label_ufs.c @@ -39,12 +39,16 @@ __FBSDID("$FreeBSD$"); #include <geom/geom.h> #include <geom/label/g_label.h> -#define G_LABEL_UFS_DIR "ufs" +#define G_LABEL_UFS_VOLUME_DIR "ufs" +#define G_LABEL_UFS_ID_DIR "ufsid" + +#define G_LABEL_UFS_VOLUME 0 +#define G_LABEL_UFS_ID 1 static const int superblocks[] = SBLOCKSEARCH; static void -g_label_ufs_taste(struct g_consumer *cp, char *label, size_t size) +g_label_ufs_taste_common(struct g_consumer *cp, char *label, size_t size, int what) { struct g_provider *pp; int sb, superblock; @@ -96,18 +100,50 @@ g_label_ufs_taste(struct g_consumer *cp, char *label, size_t size) } G_LABEL_DEBUG(1, "%s file system detected on %s.", fs->fs_magic == FS_UFS1_MAGIC ? "UFS1" : "UFS2", pp->name); - /* Check for volume label */ - if (fs->fs_volname[0] == '\0') { - g_free(fs); - continue; + switch (what) { + case G_LABEL_UFS_VOLUME: + /* Check for volume label */ + if (fs->fs_volname[0] == '\0') { + g_free(fs); + continue; + } + strlcpy(label, fs->fs_volname, size); + break; + case G_LABEL_UFS_ID: + if (fs->fs_id[0] == 0 && fs->fs_id[1] == 0) { + g_free(fs); + continue; + } + snprintf(label, size, "%08x%08x", fs->fs_id[0], + fs->fs_id[1]); + break; } - strlcpy(label, fs->fs_volname, size); g_free(fs); break; } } -const struct g_label_desc g_label_ufs = { - .ld_taste = g_label_ufs_taste, - .ld_dir = G_LABEL_UFS_DIR +static void +g_label_ufs_volume_taste(struct g_consumer *cp, char *label, size_t size) +{ + + g_label_ufs_taste_common(cp, label, size, G_LABEL_UFS_VOLUME); +} + +static void +g_label_ufs_id_taste(struct g_consumer *cp, char *label, size_t size) +{ + + g_label_ufs_taste_common(cp, label, size, G_LABEL_UFS_ID); +} + + +const struct g_label_desc g_label_ufs_volume = { + .ld_taste = g_label_ufs_volume_taste, + .ld_dir = G_LABEL_UFS_VOLUME_DIR +}; + +const struct g_label_desc g_label_ufs_id = { + .ld_taste = g_label_ufs_id_taste, + .ld_dir = G_LABEL_UFS_ID_DIR }; |