From owner-svn-src-all@FreeBSD.ORG  Wed Oct 17 11:24:19 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8DA55D13;
 Wed, 17 Oct 2012 11:24:19 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 74F6C8FC08;
 Wed, 17 Oct 2012 11:24:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9HBOJAS059098;
 Wed, 17 Oct 2012 11:24:19 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9HBOJXx059096;
 Wed, 17 Oct 2012 11:24:19 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201210171124.q9HBOJXx059096@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 17 Oct 2012 11:24:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r241631 - stable/8/sys/boot/zfs
X-SVN-Group: stable-8
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.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Oct 2012 11:24:19 -0000

Author: avg
Date: Wed Oct 17 11:24:19 2012
New Revision: 241631
URL: http://svn.freebsd.org/changeset/base/241631

Log:
  MFC r241291: zfs boot spa_status: print bootfs for each reported pool

Modified:
  stable/8/sys/boot/zfs/zfsimpl.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/boot/   (props changed)

Modified: stable/8/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/8/sys/boot/zfs/zfsimpl.c	Wed Oct 17 11:24:06 2012	(r241630)
+++ stable/8/sys/boot/zfs/zfsimpl.c	Wed Oct 17 11:24:19 2012	(r241631)
@@ -64,6 +64,8 @@ static char *zfs_temp_buf, *zfs_temp_end
 #define TEMP_SIZE	(1024 * 1024)
 
 static int zio_read(const spa_t *spa, const blkptr_t *bp, void *buf);
+static int zfs_get_root(const spa_t *spa, uint64_t *objid);
+static int zfs_rlookup(const spa_t *spa, uint64_t objnum, char *result);
 
 static void
 zfs_init(void)
@@ -726,11 +728,20 @@ vdev_status(vdev_t *vdev, int indent)
 static void
 spa_status(spa_t *spa)
 {
+	static char bootfs[ZFS_MAXNAMELEN];
+	uint64_t rootid;
 	vdev_t *vdev;
 	int good_kids, bad_kids, degraded_kids;
 	vdev_state_t state;
 
 	pager_printf("  pool: %s\n", spa->spa_name);
+	if (zfs_get_root(spa, &rootid) == 0 &&
+	    zfs_rlookup(spa, rootid, bootfs) == 0) {
+		if (bootfs[0] == '\0')
+			pager_printf("bootfs: %s\n", spa->spa_name);
+		else
+			pager_printf("bootfs: %s/%s\n", spa->spa_name, bootfs);
+	}
 	pager_printf("config:\n\n");
 	pager_printf(STATUS_FORMAT, "NAME", "STATE");