From owner-svn-src-stable@FreeBSD.ORG Wed Apr 3 21:15:22 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 89D313A2; Wed, 3 Apr 2013 21:15:22 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7A43CF45; Wed, 3 Apr 2013 21:15:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r33LFMgk079823; Wed, 3 Apr 2013 21:15:22 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33LFMDl079822; Wed, 3 Apr 2013 21:15:22 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201304032115.r33LFMDl079822@svn.freebsd.org> From: Xin LI Date: Wed, 3 Apr 2013 21:15:22 +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: r249068 - stable/8/cddl/contrib/opensolaris/cmd/zpool X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 21:15:22 -0000 Author: delphij Date: Wed Apr 3 21:15:21 2013 New Revision: 249068 URL: http://svnweb.freebsd.org/changeset/base/249068 Log: The current ZFS version in 8-STABLE supports feature flags, which enables many new features but makes it impossible to import pools created on earlier released FreeBSD 9.x releases, including 9.0 and 9.1-RELEASE, where the feature flags are not yet supported because they predates the merge (r243674), and 9.2-RELEASE will not be released before 8.4-RELEASE. To avoid surprises when users "upgrade" to 9.1-RELEASE, limit the creation version to 28 by default on stable/8. The user will still be able to upgrade the pool by using "zpool upgrade" or at create time by explicitly specifying "zpool create -o version=5000". This is a direct commit to stable/8 because it's not applicable to -HEAD, and can be reverted once 9.2-RELEASE is released. Requested by: re (jpaetzel, hrs) Reviewed by: mm Modified: stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Modified: stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed Apr 3 20:52:17 2013 (r249067) +++ stable/8/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Wed Apr 3 21:15:21 2013 (r249068) @@ -856,6 +856,19 @@ zpool_do_create(int argc, char **argv) } } +#ifdef __FreeBSD__ + /* Compatiblity with FreeBSD 9.0 and 9.1: Use version 28 if unspecified */ + if (nvlist_lookup_string(props, + zpool_prop_to_name(ZPOOL_PROP_VERSION), + &propval) != 0) { + if (add_prop_list(zpool_prop_to_name( + ZPOOL_PROP_VERSION), "28", &props, B_TRUE)) + goto errout; + enable_all_pool_feat = B_FALSE; + } else if (enable_all_pool_feat) + nvlist_remove_all(props, zpool_prop_to_name(ZPOOL_PROP_VERSION)); +#endif /* __FreeBSD__ */ + argc -= optind; argv += optind;