From owner-svn-src-vendor@FreeBSD.ORG Tue Jul 30 20:45:28 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 394B178F; Tue, 30 Jul 2013 20:45:28 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 25EF12A4F; Tue, 30 Jul 2013 20:45:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6UKjSAW061213; Tue, 30 Jul 2013 20:45:28 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6UKjStx061212; Tue, 30 Jul 2013 20:45:28 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201307302045.r6UKjStx061212@svn.freebsd.org> From: Xin LI Date: Tue, 30 Jul 2013 20:45:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r253817 - vendor-sys/illumos/dist/uts/common/sys/fs X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jul 2013 20:45:28 -0000 Author: delphij Date: Tue Jul 30 20:45:27 2013 New Revision: 253817 URL: http://svnweb.freebsd.org/changeset/base/253817 Log: Commit a missed file in r253781: Update vendor/illumos/dist and vendor-sys/illumos/dist to illumos-gate 14089:520f3adc5d46: Illumos ZFS issues: 3894 zfs should not allow snapshot of inconsistent dataset Modified: vendor-sys/illumos/dist/uts/common/sys/fs/zfs.h Modified: vendor-sys/illumos/dist/uts/common/sys/fs/zfs.h ============================================================================== --- vendor-sys/illumos/dist/uts/common/sys/fs/zfs.h Tue Jul 30 20:37:32 2013 (r253816) +++ vendor-sys/illumos/dist/uts/common/sys/fs/zfs.h Tue Jul 30 20:45:27 2013 (r253817) @@ -140,6 +140,7 @@ typedef enum { ZFS_PROP_CLONES, ZFS_PROP_LOGICALUSED, ZFS_PROP_LOGICALREFERENCED, + ZFS_PROP_INCONSISTENT, /* not exposed to the user */ ZFS_NUM_PROPS } zfs_prop_t;