9ac0bce002
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-14 14:37:35 -07:00
8cad1faa5c
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-07-14 14:37:24 -07:00
477c7a7281
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-14 14:37:21 -07:00
9de496cb93
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-14 14:37:10 -07:00
998d11b698
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-14 14:37:05 -07:00
438a7e63e9
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-14 14:37:03 -07:00
577cf02db7
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-14 14:36:41 -07:00
3574c3ff42
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-14 14:36:38 -07:00
4727a58497
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-14 14:36:36 -07:00
a142e829bb
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-14 14:36:14 -07:00
bdb57d428a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-14 14:36:11 -07:00
47060d3c2f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-14 14:36:00 -07:00
c1f0fefdc1
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-14 14:35:57 -07:00
bf1fa2ce96
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-14 14:35:46 -07:00
563dcb7a96
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-14 14:35:41 -07:00
4fca36af49
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-14 14:35:30 -07:00
4367207e48
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-14 14:35:27 -07:00
2b6e42affc
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-14 14:35:16 -07:00
3e3d9c9139
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-14 14:35:13 -07:00
02bab3a45d
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-14 14:35:02 -07:00
8a5ac45c16
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-14 14:34:55 -07:00
8121895a61
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-14 14:34:44 -07:00
1abe2b0b12
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-14 14:34:40 -07:00
fef9a2c571
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-14 14:34:39 -07:00
9b9f17a585
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-14 14:34:37 -07:00
6923d172c5
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-07-14 14:34:36 -07:00
605a501311
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-07-14 14:34:35 -07:00
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
0c76ef8865
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-10 11:54:09 -07:00
d6710a2678
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-10 11:54:06 -07:00
25717bb323
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-10 11:53:51 -07:00
a851d03f90
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-10 11:53:48 -07:00
2a3accd18e
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-10 11:53:38 -07:00
302375657e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-10 11:53:35 -07:00
63ab25ce2d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-10 11:53:24 -07:00
60f6986949
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-10 11:53:21 -07:00
422c410f42
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-10 11:53:11 -07:00
36e68f7a77
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-10 11:53:08 -07:00
ba48dae5b3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-10 11:52:58 -07:00
379941cb58
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-10 11:52:55 -07:00
69cf90c73c
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-10 11:52:43 -07:00
e193cf8fe9
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-10 11:52:39 -07:00
2ff4d2c67d
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-07-10 11:52:28 -07:00
e3b978871c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-07-10 11:52:25 -07:00
a7cf190668
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-07-10 11:52:15 -07:00
a3efe824b0
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-10 11:52:11 -07:00
2cd460a77c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-07-10 11:52:01 -07:00
7cbeb850aa
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-10 11:51:55 -07:00
ef8ea87453
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-10 11:51:45 -07:00
850c1be22f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-10 11:51:42 -07:00
Brian Behlendorf