From owner-svn-src-head@freebsd.org  Tue Aug  8 11:28:40 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27882DD554A;
 Tue,  8 Aug 2017 11:28:40 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E8E24818CB;
 Tue,  8 Aug 2017 11:28:39 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v78BScvX047756;
 Tue, 8 Aug 2017 11:28:38 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v78BScI1047755;
 Tue, 8 Aug 2017 11:28:38 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201708081128.v78BScI1047755@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 8 Aug 2017 11:28:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r322247 - head/sys/cddl/contrib/opensolaris
X-SVN-Group: head
X-SVN-Commit-Author: avg
X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris
X-SVN-Commit-Revision: 322247
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Aug 2017 11:28:40 -0000

Author: avg
Date: Tue Aug  8 11:28:38 2017
New Revision: 322247
URL: https://svnweb.freebsd.org/changeset/base/322247

Log:
  MFV r322246: 8508 Mounting a zpool on 32-bit platforms panics
  
  FreeBSD note: this is a record-only commit, the actual change originated
  from FreeBSD.
  
  illumos/illumos-gate@b11fe8c01471a5bff68e83e1fe5f809ad16b3be8
  https://github.com/illumos/illumos-gate/commit/b11fe8c01471a5bff68e83e1fe5f809ad16b3be8
  
  https://www.illumos.org/issues/8508
    Mounting a zpool on a 32-bit system triggers a panic in spa_history_log_version
    () due to a type format mismatch for ZPL_VERSION. ZPL_VERSION is a unsigned
    long long, but the format expects an integer. On 64-bit platforms this may not
    be an issue due to word size and alignment. On 32-bit platforms a word size is
    half that of a long long, causing the second word of the long long to be seen
    as the string pointer for utsname.nodename.
  
  Reviewed by: Matt Ahrens <mahrens@delphix.com>
  Approved by: Dan McDonald <danmcd@joyent.com>
  Author: Justin Hibbits <chmeeedalf@gmail.com>

Modified:
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)