From c4ed98c5760cbd4a378f8cd63ca4b75de6434d80 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Wed, 25 May 2016 12:15:19 +0800 Subject: [PATCH] Imported Upstream version 0.6.5.7 --- META | 2 +- configure | 20 ++++++++++---------- module/splat/splat-condvar.c | 11 ++++++----- rpm/generic/spl-kmod.spec.in | 2 ++ rpm/generic/spl.spec.in | 2 ++ rpm/redhat/spl.spec.in | 2 ++ 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/META b/META index 912f9a5..5bc4a29 100644 --- a/META +++ b/META @@ -1,7 +1,7 @@ Meta: 1 Name: spl Branch: 1.0 -Version: 0.6.5.6 +Version: 0.6.5.7 Release: 1 Release-Tags: relext License: GPL diff --git a/configure b/configure index 7956fa6..b7ef488 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for spl 0.6.5.6. +# Generated by GNU Autoconf 2.68 for spl 0.6.5.7. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='spl' PACKAGE_TARNAME='spl' -PACKAGE_VERSION='0.6.5.6' -PACKAGE_STRING='spl 0.6.5.6' +PACKAGE_VERSION='0.6.5.7' +PACKAGE_STRING='spl 0.6.5.7' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1357,7 +1357,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures spl 0.6.5.6 to adapt to many kinds of systems. +\`configure' configures spl 0.6.5.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1428,7 +1428,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of spl 0.6.5.6:";; + short | recursive ) echo "Configuration of spl 0.6.5.7:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -spl configure 0.6.5.6 +spl configure 0.6.5.7 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1823,7 +1823,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by spl $as_me 0.6.5.6, which was +It was created by spl $as_me 0.6.5.7, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2947,7 +2947,7 @@ fi # Define the identity of the package. PACKAGE='spl' - VERSION='0.6.5.6' + VERSION='0.6.5.7' cat >>confdefs.h <<_ACEOF @@ -17462,7 +17462,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by spl $as_me 0.6.5.6, which was +This file was extended by spl $as_me 0.6.5.7, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17528,7 +17528,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -spl config.status 0.6.5.6 +spl config.status 0.6.5.7 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/module/splat/splat-condvar.c b/module/splat/splat-condvar.c index 3ffa1c7..bdbaf79 100644 --- a/module/splat/splat-condvar.c +++ b/module/splat/splat-condvar.c @@ -413,8 +413,8 @@ splat_condvar_test5(struct file *file, void *arg) kcondvar_t condvar; kmutex_t mtx; clock_t time_left, time_before, time_after, time_delta; - int64_t whole_delta; - int32_t remain_delta; + uint64_t whole_delta; + uint32_t remain_delta; int rc = 0; mutex_init(&mtx, SPLAT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL); @@ -438,19 +438,20 @@ splat_condvar_test5(struct file *file, void *arg) splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, "Thread correctly timed out and was asleep " "for %d.%d seconds (%d second min)\n", - (int)whole_delta, remain_delta, 1); + (int)whole_delta, (int)remain_delta, 1); } else { splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, "Thread correctly timed out but was only " "asleep for %d.%d seconds (%d second " - "min)\n", (int)whole_delta, remain_delta, 1); + "min)\n", (int)whole_delta, + (int)remain_delta, 1); rc = -ETIMEDOUT; } } else { splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, "Thread exited after only %d.%d seconds, it " "did not hit the %d second timeout\n", - (int)whole_delta, remain_delta, 1); + (int)whole_delta, (int)remain_delta, 1); rc = -ETIMEDOUT; } diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in index f2efbcf..f73d8ec 100644 --- a/rpm/generic/spl-kmod.spec.in +++ b/rpm/generic/spl-kmod.spec.in @@ -162,6 +162,8 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/* rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 12 2016 Ned Bass - 0.6.5.7-1 +- Fix PPC build failure zfsonlinux/spl#516 * Tue Mar 22 2016 Ned Bass - 0.6.5.6-1 - Remove artificial architecture restrictions in packaging - Add support for s390[x] zfsonlinux/spl#537 diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in index ac8b8d2..dcac68e 100644 --- a/rpm/generic/spl.spec.in +++ b/rpm/generic/spl.spec.in @@ -33,6 +33,8 @@ make install DESTDIR=%{?buildroot} %{_mandir}/man5/* %changelog +* Thu May 12 2016 Ned Bass - 0.6.5.7-1 +- Fix PPC build failure zfsonlinux/spl#516 * Tue Mar 22 2016 Ned Bass - 0.6.5.6-1 - Remove artificial architecture restrictions in packaging - Add support for s390[x] zfsonlinux/spl#537 diff --git a/rpm/redhat/spl.spec.in b/rpm/redhat/spl.spec.in index ac8b8d2..dcac68e 100644 --- a/rpm/redhat/spl.spec.in +++ b/rpm/redhat/spl.spec.in @@ -33,6 +33,8 @@ make install DESTDIR=%{?buildroot} %{_mandir}/man5/* %changelog +* Thu May 12 2016 Ned Bass - 0.6.5.7-1 +- Fix PPC build failure zfsonlinux/spl#516 * Tue Mar 22 2016 Ned Bass - 0.6.5.6-1 - Remove artificial architecture restrictions in packaging - Add support for s390[x] zfsonlinux/spl#537