94fd6b5326
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-04 14:42:33 -07:00
07feb8dfb6
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-04 14:42:22 -07:00
de27eb10c2
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-04 14:42:20 -07:00
03590ed1b0
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-04 14:42:09 -07:00
cffdc20142
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-04 14:42:07 -07:00
9c37f7593d
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-04 14:41:56 -07:00
b324dc7fd5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-04 14:41:52 -07:00
df0111c738
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-04 14:41:41 -07:00
671a2d1ed9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-04 14:41:39 -07:00
c51341909a
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-04 14:41:29 -07:00
d160703a9c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-04 14:41:26 -07:00
a0a7b07245
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-08-04 14:41:15 -07:00
a58b4008c5
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-04 14:41:12 -07:00
2665b9a863
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-04 14:41:11 -07:00
e99ebb9037
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-04 14:40:52 -07:00
37f263f244
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-04 14:40:50 -07:00
ed3e845798
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-04 14:40:48 -07:00
7f1e727449
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-08-04 14:40:23 -07:00
aa980b56d3
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-08-04 14:40:21 -07:00
eb282e1300
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-08-04 14:40:11 -07:00
65d7bfc8b3
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-04 14:40:08 -07:00
31faa86674
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-08-04 14:39:55 -07:00
4576ca6889
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-04 14:39:53 -07:00
125e17a59a
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-04 14:39:42 -07:00
2484ccf4ac
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-08-04 14:39:40 -07:00
e546bf970f
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-04 14:39:29 -07:00
83a34ce138
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-04 14:39:22 -07:00
139ca4655e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-04 14:39:11 -07:00
07d67306a1
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-08-04 14:39:09 -07:00
3e5388907b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-04 14:39:07 -07:00
9aedfd95f6
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-08-04 14:39:06 -07:00
7b71127c1c
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-08-04 14:39:04 -07:00
0741d789d2
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-08-04 14:39:04 -07:00
0ebcbe2e74
Revert unneeded ztest_resume() prototype changes to match upstream.
2009-08-04 14:29:50 -07:00
c0ce3b40f2
Reimplement user kthreads based on pthread thread specific data.
...
This resolves previous scalabily concerns about the cost of calling
curthread which previously required a list walk. The kthread address
is now tracked as thread specific data which can be quickly returned.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-08-04 13:55:15 -07:00
a7f134832b
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-04 10:49:22 -07:00
9be5ad2924
Flag ZIO_FLAG_SPECULATIVE now issues READ instead of READA.
...
There is concern that READA may do more than simply reorder the queue.
There may be an increased chance that a requested marked READA will
fail because the elevator considers it optional. For this reason, all
read requests, even speculative ones, have been converted back to READ.
2009-08-04 10:37:40 -07:00
3554d89e0d
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-03 16:32:44 -07:00
bc5b70f84b
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-08-03 16:32:43 -07:00
1818c5f474
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-03 16:32:35 -07:00
47c7c71893
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-03 16:32:33 -07:00
156c57bd7c
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-03 16:32:25 -07:00
eeb222ffbc
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-03 16:32:23 -07:00
13480c6256
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-03 16:32:08 -07:00
70903db9f4
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-08-03 16:32:06 -07:00
4260c3366e
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-03 16:31:58 -07:00
c2c1a5865e
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-03 16:31:57 -07:00
d250570476
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-03 16:31:48 -07:00
6dc3d8c112
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-03 16:31:47 -07:00
7041b06d01
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-03 16:31:34 -07:00
Brian Behlendorf
Ricardo M. Correia