From owner-svn-src-head@freebsd.org Wed Feb 21 18:29:34 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7201F1CA47; Wed, 21 Feb 2018 18:29:33 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 31B0C6A815; Wed, 21 Feb 2018 18:29:33 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lf0-f49.google.com with SMTP id t204so3731158lff.9; Wed, 21 Feb 2018 10:29:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=jMVxEIH4B8u8d6elOT4UVRGY5WRwcT41FPHJDAoPgdM=; b=sD310TWbgD+YawtHl+yNIhMQKfLCZhDDua7gBKn+Pkky3LyQSBYZ0BlBDyPhHDb8Uz EakLmgqIC9Xw+aioXRqqhf1nAJCO1BA8+eGontkM7Tg/dckrfT8M2xpM8aXcG8u26Bgf LMoQLWIANB8tAbqXFQgpjiQUmvzrgeWxHw32/SdSrubpogLxcgNCFSGEj+hDpZ2g7a3s m9tdvFtOexGzslnXkg9Ys9sVJ8EFq7jnqc9KlNmMy/TIOhJvsY+mxBfTctas9uVedibC hbgEQkTjvigIgcxvJmXK5grzhaf6lwce5SMTd8uXxbIeaOyumdKdyFDa5pfvfRb2zLJ8 TTyA== X-Gm-Message-State: APf1xPAMTngXtxN2/LOllOsAgIr5MwQ6awslv56JEb2AhOCaMcC3w0ok blFqPRB0ibXuLdDUsrCvIYn8ayhX X-Google-Smtp-Source: AH8x224N5AdoMGO7ldw33zg6mlZePI84fWEI+kdK4pMziKWvb28KnjBTF0DHztbQoqOnAKe3kQ0ORg== X-Received: by 10.46.99.130 with SMTP id s2mr2913684lje.17.1519237766131; Wed, 21 Feb 2018 10:29:26 -0800 (PST) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id w23sm1053123lfd.10.2018.02.21.10.29.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2018 10:29:25 -0800 (PST) Subject: Re: svn commit: r329738 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201802211812.w1LICJAO016554@repo.freebsd.org> Cc: Alexander Motin From: Andriy Gapon Message-ID: Date: Wed, 21 Feb 2018 20:29:23 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <201802211812.w1LICJAO016554@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Feb 2018 18:29:34 -0000 On 21/02/2018 20:12, Alexander Motin wrote: > Author: mav > Date: Wed Feb 21 18:12:19 2018 > New Revision: 329738 > URL: https://svnweb.freebsd.org/changeset/base/329738 > > Log: > MFV r329736: 8969 Cannot boot from RAIDZ with parity > 1 > > illumos/illumos-gate@0fb055e81fd0cda5221da8ddd98b2f8d1fc6bdbe > > At present it is possible to boot from a root pool that is on RAIDZ but not > one that is on RAIDZ2 or RAIDZ3. This is because, at the time the pool > version is checked to ensure support for dual/triple parity, the uberblock > has not yet been loaded into the SPA and therefore the code determines that > the pool version is too old and returns ENOTSUP. Just a note that this change is to the illumos specific code. The FreeBSD counterpart had the fix for long time. > Reviewed by: Igor Kozhukhov > Reviewed by: Andriy Gapon > Reviewed by: Pavel Zakharov > Reviewed by: Andy Stormont > Reviewed by: Toomas Soome > Approved by: Gordon Ross > Author: Andy Fiddaman > > FreeBSD already had this fixed, so this is just a diff reduction. > > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c > Directory Properties: > head/sys/cddl/contrib/opensolaris/ (props changed) > > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c > ============================================================================== > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Wed Feb 21 18:10:50 2018 (r329737) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Wed Feb 21 18:12:19 2018 (r329738) > @@ -30,6 +30,7 @@ > * Copyright 2016 Toomas Soome > * Copyright 2017 Joyent, Inc. > * Copyright (c) 2017 Datto Inc. > + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. > */ > > /* > @@ -4141,6 +4142,9 @@ spa_import_rootpool(char *devpath, char *devid) > spa = spa_add(pname, config, NULL); > spa->spa_is_root = B_TRUE; > spa->spa_import_flags = ZFS_IMPORT_VERBATIM; > + if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, > + &spa->spa_ubsync.ub_version) != 0) > + spa->spa_ubsync.ub_version = SPA_VERSION_INITIAL; > > /* > * Build up a vdev tree based on the boot device's label config. > -- Andriy Gapon