Commit Graph

3861 Commits

Author SHA1 Message Date
Brian Behlendorf 87af8ae76b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 12:14:37 -07:00
Brian Behlendorf 9fd12ce4fd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 12:11:21 -07:00
Brian Behlendorf 2b71569742 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-16 12:11:20 -07:00
Brian Behlendorf f00293115a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-06-16 12:11:19 -07:00
Brian Behlendorf 877a37d8bd Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-16 12:11:18 -07:00
Brian Behlendorf 8a001d8f59 Extra uninit vars flagged by gcc 4.1.2
Newer versions of the compiler are OK with this but for the sake of
older compilers explicitly initialize them.
2010-06-16 11:45:07 -07:00
Brian Behlendorf f224397b56 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 16:59:40 -07:00
Brian Behlendorf b41c7ff877 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 16:45:47 -07:00
Brian Behlendorf 7f181ac166 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-14 16:45:46 -07:00
Brian Behlendorf 1121733c6a Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:45:33 -07:00
Brian Behlendorf 2f30cc0188 Merge branch 'fix-stack-lzjb' into refs/top-bases/fix-branch 2010-06-14 16:45:33 -07:00
Brian Behlendorf 4327d5dce3 New TopGit dependency: fix-stack-lzjb 2010-06-14 16:45:31 -07:00
Brian Behlendorf b8cc785fb6 Add fix-stack-lzjb topic branch
Reduce kernel stack usage by lzjb_compress() by moving uint16 array
off the stack and on to the heap.  The exact performance implications
of this I have not measured but we absolutely need to keep stack
usage to a minimum.  If/when this becomes and issue we optimize.
2010-06-14 16:45:01 -07:00
Brian Behlendorf 2392c05ea7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:43:33 -07:00
Brian Behlendorf 51322821f3 Merge branch 'fix-kstat-xuio' into refs/top-bases/fix-branch 2010-06-14 16:43:32 -07:00
Brian Behlendorf f70976285e New TopGit dependency: fix-kstat-xuio 2010-06-14 16:43:30 -07:00
Brian Behlendorf f61a7ce9e1 Add fix-kstat-xuio topic branch
Move xiou stat structures from a header to the dmu.c source as is
done with all the other kstat interfaces.  This information is local
to dmu.c registered the xuio kstat and should stay that way.
2010-06-14 16:43:01 -07:00
Brian Behlendorf 963518b20f Merge branch 'fix-metaslab' into refs/top-bases/fix-branch 2010-06-14 16:40:45 -07:00
Brian Behlendorf 105afa78b4 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:40:45 -07:00
Brian Behlendorf 9519cc9a54 New TopGit dependency: fix-metaslab 2010-06-14 16:40:43 -07:00
Brian Behlendorf f3a61f709d Add fix-metaslab topic branch
If your only going to allow one allocator to be used and it is defined
at compile time there is no point including the others in the build.
This patch could/should be refined for Linux to make the metaslab
configurable at run time.  That might be a bit tricky however since
you would need to quiese all IO.  Short of that making it configurable
as a module load option would be a reasonable compromise.
2010-06-14 16:40:26 -07:00
Brian Behlendorf f3f44cbd31 Merge branch 'fix-current' into refs/top-bases/fix-branch 2010-06-14 16:39:27 -07:00
Brian Behlendorf 5b9ebcb897 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:39:27 -07:00
Brian Behlendorf 7a73e51832 New TopGit dependency: fix-current 2010-06-14 16:39:25 -07:00
Brian Behlendorf 6cf7f7c9df Add fix-current topic branch
In the linux kernel 'current' is defined to mean the current process
and can never be used as a local variable in a function.  Simply
replace all usage of 'current' with 'curr' in this function.
2010-06-14 16:38:56 -07:00
Brian Behlendorf a1a41b3235 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 16:28:36 -07:00
Brian Behlendorf 08060ef853 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 16:25:02 -07:00
Brian Behlendorf eb894076a4 Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
2010-06-14 16:24:45 -07:00
Brian Behlendorf 2969945552 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2010-06-14 16:22:00 -07:00
Brian Behlendorf a02204a8b5 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:22:00 -07:00
Brian Behlendorf bce1904fbb Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-06-14 16:21:59 -07:00
Brian Behlendorf 6574b7cad4 New TopGit dependency: fix-pthreads 2010-06-14 16:21:57 -07:00
Brian Behlendorf f9f342c5f2 Add fix-pthreads topic branch
This is a portability change which removes the dependence of the Solaris
thread library.  All locations where Solaris thread API was used before
have been replaced with equivilant Solaris kernel style thread calls.
In user space the kernel style threading API is implemented in term of
the portable pthreads library.  This includes all threads, mutexs,
condition variables, reader/writer locks, and taskqs.
2010-06-14 16:20:44 -07:00
Brian Behlendorf 49ad53c46f Update fix-taskq to never sleep at interrupt time
Updated fix to detect if we are in an interrupt and only sleep if it
is safe to do some.  I guess it must be safe to sleep under Solaris
this must be handled in a sort interrupt handler there
2010-06-14 16:14:23 -07:00
Brian Behlendorf 3877ce40fa Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 15:52:43 -07:00
Brian Behlendorf 06b5dc883f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 15:51:52 -07:00
Brian Behlendorf 953aa00176 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 15:51:51 -07:00
Brian Behlendorf 3700f9d20b Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-06-14 15:51:50 -07:00
Brian Behlendorf 5fa2cb516b Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2010-06-14 15:51:50 -07:00
Brian Behlendorf 21690470e3 Update linux-zpios to use updated DMU API
The DMU API has been modified to remove the dmu_objset_open, and
dmu_objset_close functions.  Now you must explicitly *_create an
objset, then *_own it, *_disown it when not in use, and *_destroy
it when your through.  All and all I like the API much better.

Additionally, while I was here I moved the zpios_cmd_t off the
stack because previous analysis showed it was very stack heavy.
2010-06-14 15:48:55 -07:00
Brian Behlendorf c430e23552 Update zfs-branch with build system updates
Required Makefile modifications for updated ZFS code.
2010-06-14 15:46:11 -07:00
Brian Behlendorf ea78161e40 Update META to version 0.5.0 2010-06-14 15:45:23 -07:00
Brian Behlendorf 696ec7fb61 Update gcc-missing-braces based on structure changes
Almost exclusively this patch handled the addition of another char
array to the zfs_cmd_t structure.  Unfortunately c90 doesn't allow
zero filling the entire struct with the '= { 0 };' shorthand.
2010-06-14 15:44:06 -07:00
Brian Behlendorf 541bbe3109 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 15:38:01 -07:00
Brian Behlendorf 7eadc495c6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 15:37:05 -07:00
Brian Behlendorf b5ba75f385 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 15:37:03 -07:00
Brian Behlendorf 7022cf22c3 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-06-14 15:37:02 -07:00
Brian Behlendorf dfe881c0ef Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-06-14 15:37:01 -07:00
Brian Behlendorf 1e7a75049a Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf c8d75a1c9d Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00