From owner-svn-src-all@freebsd.org Wed Oct 4 12:23:35 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9176AE38A95; Wed, 4 Oct 2017 12:23:35 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EF65A54; Wed, 4 Oct 2017 12:23:35 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v94CNYQl024924; Wed, 4 Oct 2017 12:23:34 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v94CNYpS024923; Wed, 4 Oct 2017 12:23:34 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201710041223.v94CNYpS024923@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 4 Oct 2017 12:23:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324275 - head/sys/dev/md X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/dev/md X-SVN-Commit-Revision: 324275 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Wed, 04 Oct 2017 12:23:35 -0000 Author: trasz Date: Wed Oct 4 12:23:34 2017 New Revision: 324275 URL: https://svnweb.freebsd.org/changeset/base/324275 Log: 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 Modified: head/sys/dev/md/md.c Modified: head/sys/dev/md/md.c ============================================================================== --- head/sys/dev/md/md.c Wed Oct 4 12:06:24 2017 (r324274) +++ head/sys/dev/md/md.c Wed Oct 4 12:23:34 2017 (r324275) @@ -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, 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, str 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,