From 253f5a2edbfa1be319990af60467c380f325cd03 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Wed, 4 Oct 2017 12:23:34 +0000 Subject: [PATCH] Make md(4) support GEOM::ident for vnode-backed disks. It's based on backing file device and inode numbers. This is useful for gmountver(8) regression tests. MFC after: 2 weeks Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D12230 --- sys/dev/md/md.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index 9d909211476..21ad615ef05 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -207,6 +207,7 @@ struct md_s { unsigned opencount; unsigned fwheads; unsigned fwsectors; + char ident[32]; unsigned flags; char name[20]; struct proc *procp; @@ -1181,6 +1182,9 @@ md_kthread(void *arg) sc->fwheads))) || g_handleattr_int(bp, "GEOM::candelete", 1)) error = -1; + else if (sc->ident[0] != '\0' && + g_handleattr_str(bp, "GEOM::ident", sc->ident)) + error = -1; else if (g_handleattr_int(bp, "MNT::verified", isv)) error = -1; else @@ -1414,6 +1418,8 @@ mdcreate_vnode(struct md_s *sc, struct md_ioctl *mdio, struct thread *td) sc->fwsectors = mdio->md_fwsectors; if (mdio->md_fwheads != 0) sc->fwheads = mdio->md_fwheads; + snprintf(sc->ident, sizeof(sc->ident), "MD-DEV%ju-INO%ju", + (uintmax_t)vattr.va_fsid, (uintmax_t)vattr.va_fileid); sc->flags = mdio->md_options & (MD_FORCE | MD_ASYNC | MD_VERIFY); if (!(flags & FWRITE)) sc->flags |= MD_READONLY; @@ -1898,6 +1904,11 @@ g_md_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, indent, (uintmax_t) mp->fwheads); sbuf_printf(sb, "%s%ju\n", indent, (uintmax_t) mp->fwsectors); + if (mp->ident[0] != '\0') { + sbuf_printf(sb, "%s", indent); + g_conf_printf_escaped(sb, "%s", mp->ident); + sbuf_printf(sb, "\n"); + } sbuf_printf(sb, "%s%ju\n", indent, (uintmax_t) mp->mediasize); sbuf_printf(sb, "%s%s\n", indent,