8132a3c957
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-12 15:43:12 -07:00
9020f2aa4f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-12 15:43:10 -07:00
fcefe962d9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-12 15:43:04 -07:00
b3d4a8ab01
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-12 15:43:02 -07:00
7a427c66fc
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 15:42:56 -07:00
37ed92aa16
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-12 15:42:54 -07:00
7d2911e218
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-12 15:42:48 -07:00
0807f25108
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-12 15:42:46 -07:00
cf063b8afb
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-12 15:42:40 -07:00
bd86729c1e
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-12 15:42:38 -07:00
591d1ffa1a
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 15:42:32 -07:00
0ea871c850
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-12 15:42:29 -07:00
74cb15796f
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-12 15:42:23 -07:00
b53d834575
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-12 15:42:21 -07:00
62e9e03ada
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-12 15:42:15 -07:00
6af4aa43ec
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-12 15:42:13 -07:00
7ded72a08d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-08-12 15:42:12 -07:00
de99114352
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-08-12 15:42:11 -07:00
47b9bf778f
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-08-12 15:42:10 -07:00
a1c9fee0c9
Merge branch 'fix-commit-callback' into refs/top-bases/fix-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-08-12 15:37:51 -07:00
eca561bddb
New TopGit dependency: fix-commit-callback
2010-08-12 15:36:24 -07:00
8af0664652
Fix upstream commit callback
...
The upstream commit cb code had a few bugs:
1) The arguments of the list_move_tail() call in txg_dispatch_callbacks()
were reversed by mistake. This caused the commit callbacks to not be
called at all.
2) ztest had a bug in ztest_dmu_commit_callbacks() where "error" was not
initialized correctly. This seems to have caused the test to always take
the simulated error code path, which made ztest unable to detect whether
commit cbs were being called for transactions that successfuly complete.
3) ztest had another bug in ztest_dmu_commit_callbacks() where the commit
cb threshold was not being compared correctly.
4) The commit cb taskq was using 'max_ncpus * 2' as the maxalloc argument
of taskq_create(), which could have caused unnecessary delays in the txg
sync thread.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-08-12 15:34:29 -07:00
7b97c6b097
Add fix-commit-callback topic branch
2010-08-12 15:33:57 -07:00
868fd5d434
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-12 15:25:34 -07:00
56e8c04c78
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-12 15:25:32 -07:00
63aef3adba
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-12 15:25:26 -07:00
411f33af33
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-12 15:25:24 -07:00
9694fd2f8c
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-12 15:25:19 -07:00
f06cae9560
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-12 15:25:17 -07:00
9a464d4486
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-12 15:25:11 -07:00
b8bc4c2cf6
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-12 15:25:09 -07:00
b00685b410
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-12 15:25:03 -07:00
055cf7ff30
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-12 15:25:01 -07:00
731e541e70
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:56 -07:00
296f0a8cb9
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-12 15:24:54 -07:00
11b828c51d
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:48 -07:00
b4f9d430e5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-12 15:24:46 -07:00
4dd57c5dd4
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:40 -07:00
02cb279a1f
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-12 15:24:38 -07:00
40fb00e561
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:33 -07:00
66804a7e71
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-12 15:24:30 -07:00
a43b705567
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:25 -07:00
3c501de6b6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-12 15:24:23 -07:00
661e6fd39d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:17 -07:00
6e52879ce7
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-12 15:24:15 -07:00
0d73c1d7fa
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:09 -07:00
41cdefaec2
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-12 15:24:07 -07:00
73cebd0763
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-12 15:24:02 -07:00
67e828de43
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-12 15:23:59 -07:00
d07fd603e1
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 15:23:54 -07:00
Brian Behlendorf
Ricardo M. Correia