Commit Graph

1760 Commits

Author SHA1 Message Date
Brian Behlendorf 8645a8e901 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 14:43:21 -07:00
Brian Behlendorf ca3849d1ce Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-16 14:43:18 -07:00
Brian Behlendorf 2f457b7bd0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 14:43:17 -07:00
Brian Behlendorf 8de2671680 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 14:43:17 -07:00
Brian Behlendorf a2ba5b83f8 Merge branch 'fix-stack-noinline' into refs/top-bases/fix-branch 2010-06-16 14:35:14 -07:00
Brian Behlendorf bbdb8184ec Add fix-stack-noinline topic branch
Certain function must never be automatically inlined by gcc because
they are stack heavy or called recursively.  This patch flags all
such functions I have found as 'noinline' to prevent gcc from making
the optimization.
2010-06-16 14:34:41 -07:00
Brian Behlendorf 76f112175f Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 14:27:35 -07:00
Brian Behlendorf a86fc5c4a2 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-16 14:27:32 -07:00
Brian Behlendorf 48ca6d3590 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 14:27:31 -07:00
Brian Behlendorf 7f979b27f4 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 14:27:30 -07:00
Brian Behlendorf 30c03a0914 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2010-06-16 14:27:29 -07:00
Brian Behlendorf 2115c30515 Revert fix-stack topic branch
This patch will be broken in to several independent stack reductions
and reapplied as new topic branches.
2010-06-16 14:23:31 -07:00
Brian Behlendorf 2cda60c980 Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-06-16 09:57:10 -07:00
Brian Behlendorf 8c7748d8e0 Add linux-topology topic branch
Solaris recently introduced the idea of drive topology because
where a drive is located does matter.  I have already handled
this with udev/blkid integration under Linux so I'm hopeful
this case can simply be removed but for now I've just stubbed
out what is needed in libspl and commented out the rest here.
2010-06-16 09:55:34 -07:00
Brian Behlendorf 6fa858c778 Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-06-16 09:49:06 -07:00
Brian Behlendorf 14d073e298 Add linux-sha2 topic branch for portability
The upstream ZFS code has correctly moved to a faster native sha2
implementation.  Unfortunately, under Linux that's going to be a little
problematic so we revert the code to the more portable version contained
in earlier ZFS releases.  Using the native sha2 implementation in Linux
is possible but the API is slightly different in kernel version user
space depending on which libraries are used.  Ideally, we need a fast
implementation of SHA256 which builds as part of ZFS this shouldn't be
that hard to do but it will take some effort.
2010-06-16 09:47:25 -07:00
Brian Behlendorf 1aeae83705 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 16:27:50 -07:00
Brian Behlendorf f178dd0726 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-14 16:27:47 -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 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 6348afcb98 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-14 16:10:57 -07:00
Brian Behlendorf 9193fdea7e Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 16:10:54 -07:00
Brian Behlendorf 1b55fad32f Updates to linux-user-disk
The major change is removing the thread pool when importing devices.
This may be reintroduced at some point if needed, but it is added
complexity which has already been handled by blkid on modern Linux
systems.  We only need to fallback to probing everything is /dev/
if you config file is toast and even then it only takes a few seconds.
2010-06-14 15:59:11 -07:00
Brian Behlendorf 3a0400ad88 Update linux-events
Minor updates to linux-events to handle some upstream changes.  Luckily,
this was done flexibly enough the first time it wasn't much of a problem.
2010-06-14 15:57:09 -07:00
Brian Behlendorf f9e717f642 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 15:53:31 -07:00
Brian Behlendorf 0eff59a95e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-06-14 15:52:53 -07:00
Brian Behlendorf b60b922211 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-14 15:52:51 -07:00
Brian Behlendorf 0c0ea412b3 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-14 15:52:34 -07:00
Brian Behlendorf fb35fe3bc1 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 15:51:56 -07:00
Brian Behlendorf e5175423ea Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-14 15:51:54 -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 5fa2cb516b Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2010-06-14 15:51:50 -07:00
Brian Behlendorf 91cc4e35bb Updates to linux-libspl
Added print_timestamp() compatibility function, this will be needed
long term but it's a simply enough addition.

Added Solaris style label functions.  This was done simply to aid in
the initial update to onnv_141.  I'm hopeful that after more careful
inspection all of this can be removed and we can integrate with a
more Linux friendly Solution without breaking any compatibility.

Added several missing headers which are required by the updated
version of ZFS.  As usual I just add empty headers if needed because
it's easier than tracking the change against the core ZFS code.

Added SEC, MILLISEC, MICROSEC defines if unavailable.

Added missing xuio structure and typedefs.  I'm hopeful these can
be removed as well once we crack the zero-copy nut under Linux.
2010-06-14 15:47:54 -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 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 c52a71873a Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 15:38:51 -07:00
Brian Behlendorf a43ad49f64 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-14 15:38:09 -07:00
Brian Behlendorf d860bca64c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-14 15:37:52 -07:00
Brian Behlendorf e796e2a03e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:10 -07:00
Brian Behlendorf efdca3b5bc Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-14 15:37:07 -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 c8d75a1c9d Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf 1893aa76ec Update gcc-no-parenthesis
Fix new locations of missing parenthesis according to gcc.
2010-06-14 15:16:41 -07:00
Brian Behlendorf 6b17084f5f Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 14:44:31 -07:00
Brian Behlendorf d701c42ed6 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-14 14:43:54 -07:00
Brian Behlendorf 47e0108ff6 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-14 14:43:39 -07:00