0bd251d71c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-08-12 16:45:27 -07:00
9a5afe4338
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-08-12 16:45:25 -07:00
087782198b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-12 16:45:24 -07:00
52f9b6d142
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-12 16:45:23 -07:00
9ae9e077fb
Quiet two more large allocation warnings
...
Both of these allocations are larger than 8k which trips the
warning, but so no large that they must be vmem_alloc()'ed. For
this case I have added the KM_NODEBUG flag which silences the
warning. The flag also acts as a marker in the source so I can
keep track of this as something which needs to be better addressed
in the long term.
SPL: large kmem_alloc(11876, 0x50) at get_nvlist:911 (341009/1877530)
SPL: large kmem_alloc(11240, 0x50) at load_nvlist:1273 (2639492/2643588)
Closes #50
2010-08-12 16:41:09 -07:00
d24fbedd01
Honor spa_config_path for ztest '-f' option
...
The new spa_config_path string was lost from ztest_run_zdb() during
the onnv_141 merge. This commit puts it back in place so the '-f'
option is properly honored.
Additionally this function had been tweaked so ztest could be run
in-tree but that broke running it when installed as a package. I've
updated that chunk to detect where it's running and try to do the
right thing in both cases.
Closes #49
2010-08-12 16:40:16 -07:00
516f0a12b8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-08-12 15:56:21 -07:00
e9d058e46c
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-08-12 15:56:19 -07:00
2ef62f52e0
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-12 15:56:18 -07:00
d84d425c49
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-12 15:56:16 -07:00
e0b18fb03d
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-12 15:56:10 -07:00
4a0646457d
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-12 15:56:08 -07:00
c52996c767
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-12 15:56:03 -07:00
6fb9033f29
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-12 15:56:01 -07:00
ebcd1fc2a4
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-12 15:55:55 -07:00
e348a9d4ad
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-12 15:55:53 -07:00
7ed08d76f0
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-12 15:55:47 -07:00
11fc5dc54a
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-12 15:55:45 -07:00
3567e010ee
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-12 15:55:39 -07:00
5549f6174c
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-12 15:55:37 -07:00
3ac9fc75aa
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-12 15:55:31 -07:00
da44d7fc63
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-12 15:55:29 -07:00
2f89ba8437
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-12 15:55:23 -07:00
b747b7b890
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-12 15:55:21 -07:00
3b1e175195
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-12 15:55:15 -07:00
53f6f4f0aa
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-12 15:55:13 -07:00
0b83009db9
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-12 15:55:07 -07:00
e87ec55b90
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-12 15:55:05 -07:00
b9c093ff95
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-12 15:54:59 -07:00
09861f3e96
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-12 15:54:57 -07:00
a4940a062e
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-12 15:54:51 -07:00
0d43d7dc1a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-12 15:54:50 -07:00
029a6d5886
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-12 15:54:44 -07:00
fd0d8b51ab
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-12 15:54:42 -07:00
ed5963c81c
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 15:54:36 -07:00
691a47dc8e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-12 15:54:33 -07:00
123ca9c471
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-12 15:54:27 -07:00
9e1500206a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-12 15:54:25 -07:00
1329107f86
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-12 15:54:20 -07:00
3fb16111ea
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-12 15:54:18 -07:00
e7407138d8
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 15:54:11 -07:00
8f417296d7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-12 15:54:09 -07:00
5aedd84726
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-12 15:54:03 -07:00
7a44418dfc
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-12 15:54:00 -07:00
a9b244704c
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-12 15:53:54 -07:00
2e26d243e2
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-08-12 15:53:52 -07:00
5d61250631
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-12 15:53:52 -07:00
775b428dfb
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-08-12 15:53:51 -07:00
ef3c90de33
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-08-12 15:53:50 -07:00
afd34c561c
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-08-12 15:53:49 -07:00
Brian Behlendorf