mirror of
https://git.proxmox.com/git/mirror_spl-debian
synced 2025-11-03 07:45:19 +00:00
Merge tag 'upstream/0.6.5.3'
Upstream version 0.6.5.3 Conflicts: META configure module/spl/spl-taskq.c rpm/generic/spl-kmod.spec.in rpm/generic/spl.spec.in rpm/redhat/spl.spec.in
This commit is contained in:
Aron Xu
commit
05e79c8c85
2
META
2
META
@ -1,7 +1,7 @@
|
||||
Meta: 1
|
||||
Name: spl
|
||||
Branch: 1.0
|
||||
Version: 0.6.5.2
|
||||
Version: 0.6.5.3
|
||||
Release: 1
|
||||
Release-Tags: relext
|
||||
License: GPL
|
||||
|
||||
20
configure
vendored
20
configure
vendored
@ -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.2.
|
||||
# Generated by GNU Autoconf 2.68 for spl 0.6.5.3.
|
||||
#
|
||||
#
|
||||
# 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.2'
|
||||
PACKAGE_STRING='spl 0.6.5.2'
|
||||
PACKAGE_VERSION='0.6.5.3'
|
||||
PACKAGE_STRING='spl 0.6.5.3'
|
||||
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.2 to adapt to many kinds of systems.
|
||||
\`configure' configures spl 0.6.5.3 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.2:";;
|
||||
short | recursive ) echo "Configuration of spl 0.6.5.3:";;
|
||||
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.2
|
||||
spl configure 0.6.5.3
|
||||
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.2, which was
|
||||
It was created by spl $as_me 0.6.5.3, 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.2'
|
||||
VERSION='0.6.5.3'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -17452,7 +17452,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.2, which was
|
||||
This file was extended by spl $as_me 0.6.5.3, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -17518,7 +17518,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.2
|
||||
spl config.status 0.6.5.3
|
||||
configured by $0, generated by GNU Autoconf 2.68,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@ -170,7 +170,7 @@ typedef struct spl_kmem_cache {
|
||||
uint32_t skc_magic; /* Sanity magic */
|
||||
uint32_t skc_name_size; /* Name length */
|
||||
char *skc_name; /* Name string */
|
||||
spl_kmem_magazine_t *skc_mag[NR_CPUS]; /* Per-CPU warm cache */
|
||||
spl_kmem_magazine_t **skc_mag; /* Per-CPU warm cache */
|
||||
uint32_t skc_mag_size; /* Magazine size */
|
||||
uint32_t skc_mag_refill; /* Magazine refill count */
|
||||
spl_kmem_ctor_t skc_ctor; /* Constructor */
|
||||
|
||||
@ -805,15 +805,18 @@ spl_magazine_create(spl_kmem_cache_t *skc)
|
||||
if (skc->skc_flags & KMC_NOMAGAZINE)
|
||||
return (0);
|
||||
|
||||
skc->skc_mag = kzalloc(sizeof (spl_kmem_magazine_t *) *
|
||||
num_possible_cpus(), kmem_flags_convert(KM_SLEEP));
|
||||
skc->skc_mag_size = spl_magazine_size(skc);
|
||||
skc->skc_mag_refill = (skc->skc_mag_size + 1) / 2;
|
||||
|
||||
for_each_online_cpu(i) {
|
||||
for_each_possible_cpu(i) {
|
||||
skc->skc_mag[i] = spl_magazine_alloc(skc, i);
|
||||
if (!skc->skc_mag[i]) {
|
||||
for (i--; i >= 0; i--)
|
||||
spl_magazine_free(skc->skc_mag[i]);
|
||||
|
||||
kfree(skc->skc_mag);
|
||||
return (-ENOMEM);
|
||||
}
|
||||
}
|
||||
@ -833,11 +836,13 @@ spl_magazine_destroy(spl_kmem_cache_t *skc)
|
||||
if (skc->skc_flags & KMC_NOMAGAZINE)
|
||||
return;
|
||||
|
||||
for_each_online_cpu(i) {
|
||||
for_each_possible_cpu(i) {
|
||||
skm = skc->skc_mag[i];
|
||||
spl_cache_flush(skc, skm, skm->skm_avail);
|
||||
spl_magazine_free(skm);
|
||||
}
|
||||
|
||||
kfree(skc->skc_mag);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -880,12 +885,6 @@ spl_kmem_cache_create(char *name, size_t size, size_t align,
|
||||
|
||||
might_sleep();
|
||||
|
||||
/*
|
||||
* Allocate memory for a new cache and initialize it. Unfortunately,
|
||||
* this usually ends up being a large allocation of ~32k because
|
||||
* we need to allocate enough memory for the worst case number of
|
||||
* cpus in the magazine, skc_mag[NR_CPUS].
|
||||
*/
|
||||
skc = kzalloc(sizeof (*skc), lflags);
|
||||
if (skc == NULL)
|
||||
return (NULL);
|
||||
|
||||
@ -32,7 +32,7 @@ module_param(spl_taskq_thread_bind, int, 0644);
|
||||
MODULE_PARM_DESC(spl_taskq_thread_bind, "Bind taskq thread to CPU by default");
|
||||
|
||||
|
||||
int spl_taskq_thread_dynamic = 1;
|
||||
int spl_taskq_thread_dynamic = 0;
|
||||
module_param(spl_taskq_thread_dynamic, int, 0644);
|
||||
MODULE_PARM_DESC(spl_taskq_thread_dynamic, "Allow dynamic taskq threads");
|
||||
|
||||
|
||||
@ -160,6 +160,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Tue Oct 13 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.3-1
|
||||
- Fix CPU hotplug zfsonlinux/spl#482
|
||||
- Disable dynamic taskqs by default to avoid deadlock zfsonlinux/spl#484
|
||||
* Tue Sep 29 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.2-1
|
||||
- Released 0.6.5.2-1
|
||||
- Fix PAX Patch/Grsec SLAB_USERCOPY panic zfsonlinux/zfs#3796
|
||||
|
||||
@ -38,6 +38,9 @@ make install DESTDIR=%{?buildroot}
|
||||
%{_mandir}/man5/*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 13 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.3-1
|
||||
- Fix CPU hotplug zfsonlinux/spl#482
|
||||
- Disable dynamic taskqs by default to avoid deadlock zfsonlinux/spl#484
|
||||
* Tue Sep 29 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.2-1
|
||||
- Released 0.6.5.2-1
|
||||
- Fix PAX Patch/Grsec SLAB_USERCOPY panic zfsonlinux/zfs#3796
|
||||
|
||||
@ -38,6 +38,9 @@ make install DESTDIR=%{?buildroot}
|
||||
%{_mandir}/man5/*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 13 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.3-1
|
||||
- Fix CPU hotplug zfsonlinux/spl#482
|
||||
- Disable dynamic taskqs by default to avoid deadlock zfsonlinux/spl#484
|
||||
* Tue Sep 29 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.2-1
|
||||
- Released 0.6.5.2-1
|
||||
- Fix PAX Patch/Grsec SLAB_USERCOPY panic zfsonlinux/zfs#3796
|
||||
|
||||
Loading…
Reference in New Issue
Block a user