svn commit: r329481 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Sat Feb 17 23:51:15 2018
New Revision: 329481
URL: https://svnweb.freebsd.org/changeset/base/329481

Log:
  MFC r321104 (by jhibbits): Make ZFS not crash on mount on 32-bit systems
  
  ZPL_VERSION is unsigned long long, not an int.  With this change, a zpool
  can be created on a 32-bit system (tested on powerpcspe) and mounted
  correctly.

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c	Sat Feb 17 23:39:10 2018	(r329480)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c	Sat Feb 17 23:51:15 2018	(r329481)
@@ -539,7 +539,7 @@ void
 spa_history_log_version(spa_t *spa, const char *operation)
 {
 	spa_history_log_internal(spa, operation, NULL,
-	    "pool version %llu; software version %llu/%d; uts %s %s %s %s",
+	    "pool version %llu; software version %llu/%llu; uts %s %s %s %s",
 	    (u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION,
 	    utsname.nodename, utsname.release, utsname.version,
 	    utsname.machine);