From owner-svn-src-head@FreeBSD.ORG  Tue May  4 17:44:40 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C4C8E1065672;
	Tue,  4 May 2010 17:44:40 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id B41148FC0C;
	Tue,  4 May 2010 17:44:40 +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 o44HieIv088583;
	Tue, 4 May 2010 17:44:40 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o44HieS4088581;
	Tue, 4 May 2010 17:44:40 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201005041744.o44HieS4088581@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 4 May 2010 17:44:40 +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: r207627 - head/cddl/contrib/opensolaris/cmd/zfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 May 2010 17:44:40 -0000

Author: mm
Date: Tue May  4 17:44:40 2010
New Revision: 207627
URL: http://svn.freebsd.org/changeset/base/207627

Log:
  Enable "zfs list" to list explicitly requested snapshots.
  
  Partial import of OpenSolaris onnv revision:
  8415:8809e849f63e
  
  PR:		kern/146297
  Submitted by:	myself
  Approved by:	pjd, delphij (mentor)
  Obtained from:	OpenSolaris (Bug ID 6758338)
  MFC after:	2 weeks

Modified:
  head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue May  4 17:40:24 2010	(r207626)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue May  4 17:44:40 2010	(r207627)
@@ -1790,7 +1790,7 @@ zfs_do_list(int argc, char **argv)
 	boolean_t scripted = B_FALSE;
 	static char default_fields[] =
 	    "name,used,available,referenced,mountpoint";
-	int types = ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME;
+	int types = ZFS_TYPE_DATASET;
 	boolean_t types_specified = B_FALSE;
 	char *fields = NULL;
 	list_cbdata_t cb = { 0 };