60b162ecac
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-12 21:29:26 -07:00
02aee20d33
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-12 21:29:20 -07:00
79a72ca7ec
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-12 21:29:18 -07:00
3a30f281fc
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-12 21:29:12 -07:00
bd7fea7400
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-12 21:29:10 -07:00
cd26da4435
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-12 21:29:04 -07:00
e74a26ee70
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-12 21:29:02 -07:00
bd0a8dca31
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-12 21:28:56 -07:00
0f84296e63
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-12 21:28:54 -07:00
e54fdc2a18
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 21:28:47 -07:00
954949bbc6
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-12 21:28:45 -07:00
d9b8bacda8
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-12 21:28:39 -07:00
c434200b77
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-12 21:28:37 -07:00
9802de56a8
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-12 21:28:31 -07:00
6e188ba899
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-12 21:28:29 -07:00
90c298a8a8
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 21:28:22 -07:00
4a38527871
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-12 21:28:20 -07:00
c2ef7ba61d
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-12 21:28:13 -07:00
08f890c8d8
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-12 21:28:10 -07:00
f412e32773
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-12 21:28:04 -07:00
04a42bcee6
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-12 21:28:02 -07:00
5bbc3e2a68
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-08-12 21:28:01 -07:00
13eca9436e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-08-12 21:28:00 -07:00
380ce7b8eb
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-08-12 21:28:00 -07:00
a2a77e48ab
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-08-12 21:27:59 -07:00
a1f90df3db
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-08-12 21:27:59 -07:00
2b89d86fff
Initialize resid variable
...
Properly initialize the variable resid for the error case where
vn_rdwr() returns an error with setting *resid. In practice
this is harmless because the contents of resid don't matter
when vn_rdwr() returns an error. But the code does check the
result which means we may or may not end up having the check
zio->io_error. This makes gcc unhappy and having a completely
deterministic code path here is a good thing.
Closes #51
2010-08-12 21:19:01 -07:00
eed31a5029
Move unused function warning to gcc-unused topic branch
...
See commit 123b6b2f49
2010-08-12 21:17:01 -07:00
eaae9055a7
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-12 21:13:15 -07:00
123b6b2f49
Move unused function warning to gcc-unused topic branch
...
The ztest_pattern_match() function is only called from an ASSERT
and needs only to be defined when debugging is enabled. This
change is to silence a gcc warning and belong with the other
gcc issues. I'm moving it to the gcc-unused topic branch.
2010-08-12 21:05:24 -07:00
e2f8f607ec
Honor spa_config_path for ztest '-f' option
...
See commit d24fbedd01
2010-08-12 21:04:29 -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
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
Brian Behlendorf