svn commit: r321104 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Justin Hibbits]

Author: jhibbits
Date: Tue Jul 18 01:08:45 2017
New Revision: 321104
URL: https://svnweb.freebsd.org/changeset/base/321104

Log:
  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.
  
  Reviewed by:	allanjude

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c	Tue Jul 18 00:50:58 2017	(r321103)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c	Tue Jul 18 01:08:45 2017	(r321104)
@@ -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);