Commit Graph

1040 Commits

Author SHA1 Message Date
Brian Behlendorf 430d6004e5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	scripts/Makefile.am
2009-07-24 11:10:21 -07:00
Brian Behlendorf db3967ba86 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-24 11:08:43 -07:00
Brian Behlendorf 9a2275c1c5 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-24 11:08:42 -07:00
Ricardo M. Correia 51760e3c7e Change VERIFY() into VERIFY3U() when creating threads in ztest, so that we can see the return code when it fails.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-07-24 11:00:23 -07:00
Brian Behlendorf 4edfcf44ec Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-24 09:15:59 -07:00
Brian Behlendorf 82ca18caae Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-24 09:15:56 -07:00
Brian Behlendorf 825c086a4e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-07-24 09:15:55 -07:00
Brian Behlendorf e4610d7991 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-07-24 09:15:53 -07:00
Brian Behlendorf 1b4dfb80fb Increase buffer size for nvlist for large configurations
It's still not clear to me why the default value here is large
enough Solaris.  I hit this limit again when setting up 120 SATA
drives configured as 15 raidz2 groups each containing 8 drives.
We expect to go bigger so we may just want to spend a little
time and figure out how to make this all dynamic.
2009-07-24 08:53:18 -07:00
Brian Behlendorf b3dab369eb Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-20 13:26:05 -07:00
Brian Behlendorf 2b1eaf77d4 Remove zfs_debug.h which is a duplicate of the version in the
modules directory.  Having two copies is just asking for trouble.
2009-07-20 13:18:24 -07:00
Brian Behlendorf 65e81abfed Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-17 09:46:23 -07:00
Brian Behlendorf 3a63d17619 Add option -fPIC (Position Independent Code) needed for x86_64.
While the generic atomic implementation is not used by default
for x86_64 or x86 builds, we still need to always build it with
-fPIC if we ever want to use it on these platforms.
2009-07-17 09:36:01 -07:00
Brian Behlendorf 35e7382fd2 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-16 13:46:15 -07:00
Brian Behlendorf 18b7a966e4 Minor build fixes from asm-generic change.
- Drop _NOTE(CONSTCOND) usage in libspl this is Solaris specific.
- Resolve conflicting OR and AND long prototypes.
2009-07-16 13:37:59 -07:00
Brian Behlendorf ac81bc8094 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-16 10:28:14 -07:00
Brian Behlendorf 3ae0e369f3 Add generic user space atomic support.
Futher testing on my powerpc system revealed that the powerpc
specific atomic implemetation was flawed.  Rather than spending
a lot of time correctly reimplementing it in assembly I have
reworked it in to a 100% generic version.  The generic version
will not perform well but it does provide correct sematics.  It
will be used only when there is no architecture specific version
available.  These changes do not impact x86_64 and x86 which have
have correct native implementations.
2009-07-16 09:59:44 -07:00
Brian Behlendorf 1c396c4600 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-14 16:55:21 -07:00
Brian Behlendorf 5b0851cbdb Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-14 16:49:36 -07:00
Brian Behlendorf 5753d78dcd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-14 16:49:29 -07:00
Brian Behlendorf e9d7526fb3 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-14 16:49:27 -07:00
Brian Behlendorf a13cdecdd2 Remove debug printf 2009-07-14 16:35:13 -07:00
Brian Behlendorf 5a3e63ff19 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-14 15:38:46 -07:00
Ricardo M. Correia 4279777f47 Fixed the zpool and zfs commands returning 'internal error: Out of memory.' due to a failure in nvlist_common().
The failure turned out to be missing macro definitions for little
endian and big endian.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-07-14 15:31:03 -07:00
Brian Behlendorf 5427e1eec2 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-14 14:39:09 -07:00
Brian Behlendorf 8121895a61 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-14 14:34:44 -07:00
Brian Behlendorf fef9a2c571 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-14 14:34:39 -07:00
Brian Behlendorf 9b9f17a585 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-14 14:34:37 -07:00
Brian Behlendorf 864e44e7e0 Provide correct kthread API semantics using pthreads.
The intent here is to fully remove the previous Solaris thread
implementation so we don't need to simulate both Solaris kernel
and user space thread APIs.  The few user space consumers of the
thread API have been updated to use the kthread API.  In order
to support this we needed to more fully support the kthread API
and that means not doing crazy things like casting a thread id
to a pointer and using that as was done before.  This first
implementation is not effecient but it does provide all the
corrent semantics.  If/when performance becomes and issue we
can and should just natively adopt pthreads which is portable.

Let me finish by saying I'm not proud of any of this and I would
love to see it improved.  However, this slow implementation does
at least provide all the correct kthread API semantics whereas
the previous method of casting the thread ID to a pointer was
dodgy at best.
2009-07-14 14:16:26 -07:00
Brian Behlendorf 7e720d98a3 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-09 12:28:04 -07:00
Brian Behlendorf 9cf1451c53 Add ASSERTV macro to simplify removing variables (the V in ASSERTV)
when they are only used in ASSERTs which will be compiled out.
2009-07-09 12:08:40 -07:00
Brian Behlendorf 7669102a92 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-08 16:26:27 -07:00
Brian Behlendorf a3d336e1ae Drop support for the Solaris user space thread_t API. This was just
too confusing.  The two consumers of this (ztest.c and taskq.c) have
been updated to use the Solaris kernel space kthread_t API which is
provided by zfs_context.h.
2009-07-08 16:15:42 -07:00
Brian Behlendorf fd94a958ff Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-08 15:04:51 -07:00
Brian Behlendorf c821af8f89 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-08 15:00:48 -07:00
Brian Behlendorf 058a25a017 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 15:00:43 -07:00
Brian Behlendorf 275d66171b Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-08 15:00:41 -07:00
Brian Behlendorf 1ab1b8502b Stop the kthread/thread/pthread mixing and matching insanity. Update all
code to only use the kthread API regardless of if it is compiled in the
kernel or user space.  The kthread API will be layered on top of pthreads
as best as possible in zfs_context, this is non optimal but much clearer.
2009-07-08 14:47:23 -07:00
Brian Behlendorf 15c4a8be0c Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-07 15:35:07 -07:00
Brian Behlendorf 31157f3a90 Disable zpool_relabel_disk() which requires libefi until we have it. 2009-07-07 15:26:39 -07:00
Brian Behlendorf 23e01e6cde Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-07 15:07:37 -07:00
Brian Behlendorf 24402e5c15 Drop duplicate defines 2009-07-07 14:58:56 -07:00
Brian Behlendorf c35e61eea2 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-07 14:50:41 -07:00
Brian Behlendorf 04aa3d5ef9 Header aclutils.h only needed by idmap. 2009-07-07 14:41:19 -07:00
Brian Behlendorf 678b02cd8e Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-07 14:32:59 -07:00
Brian Behlendorf c3efeee12a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-07 14:32:08 -07:00
Brian Behlendorf daebbab116 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-07 14:31:41 -07:00
Brian Behlendorf 33804ec976 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-07 14:29:09 -07:00
Brian Behlendorf 7c76f3ce22 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-07 14:28:18 -07:00
Brian Behlendorf 3ad5361df2 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 14:28:14 -07:00