d753fa7a12
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-28 11:32:55 -07:00
4fa43a86d4
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-28 11:32:53 -07:00
ef8c360611
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-28 11:32:51 -07:00
d8ebc2ab21
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-28 11:32:49 -07:00
58a4452bfc
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-28 11:32:44 -07:00
799b8788a9
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-28 11:32:41 -07:00
c0ad9a1962
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-28 11:32:36 -07:00
086e6034ca
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-28 11:32:34 -07:00
a9e5d32fb8
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-28 11:32:28 -07:00
4975fd71de
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-28 11:32:26 -07:00
55ce8b9e36
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-28 11:32:21 -07:00
90fa1ce7d6
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-28 11:32:19 -07:00
5a8c1a3f95
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-06-28 11:32:13 -07:00
ae2285b17d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-28 11:32:11 -07:00
f3924aea0e
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-28 11:32:05 -07:00
d843c10d7e
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-28 11:32:03 -07:00
db396bcda0
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:58 -07:00
456ae258ee
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-28 11:31:56 -07:00
f44dd08b58
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:50 -07:00
01f2707edd
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-28 11:31:48 -07:00
699cf2179f
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:42 -07:00
c28d601c0d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-28 11:31:40 -07:00
f6ad0de60a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:35 -07:00
99cf2d2228
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-28 11:31:33 -07:00
b2313a226a
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:27 -07:00
2a6d923e62
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-28 11:31:25 -07:00
0528b9769b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:19 -07:00
fbed3151dd
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-28 11:31:17 -07:00
dc3e2f3f92
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:11 -07:00
4452e42d9c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-28 11:31:09 -07:00
759df09df2
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-28 11:31:03 -07:00
7b16b35821
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-28 11:31:01 -07:00
61adb3379a
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-28 11:30:55 -07:00
6412189f1b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-28 11:30:53 -07:00
c02813baef
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-28 11:30:47 -07:00
671f1fbf43
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-28 11:30:45 -07:00
5b33cbea31
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-28 11:30:39 -07:00
d6af6c6ad2
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-28 11:30:37 -07:00
843af873bf
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-28 11:30:36 -07:00
17a1689bd4
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-28 11:30:35 -07:00
9a29d55b2f
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-28 11:30:34 -07:00
c2793dd0c7
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-06-28 11:30:34 -07:00
f32ec2346b
Linux bcopy() requires word aligned memory, use memcpy()
...
Much to my surprise bcopy() under Linux appears to copy the data in
word sized chunks. It does the right thing but if you buffer is not
a multiple of the word size you will be reading past the end of your
buffer. Or at least that is what valgrind is reporting. We should
be using mempcy() anyway on Linux so replace bcopy() with memcpy()
to resolve the issue.
==305== Thread 211:
==305== Invalid read of size 8
==305== at 0x3BCD28357D: _wordcopy_fwd_dest_aligned (in /lib64/libc-2.11.1.so)
==305== by 0x3BCD282B05: bcopy (in /lib64/libc-2.11.1.so)
==305== by 0x58D7FEF: dmu_write (dmu.c:730)
==305== by 0x591C942: spa_history_write (spa_history.c:165)
==305== by 0x591D255: spa_history_log_sync (spa_history.c:277)
==305== by 0x591D545: log_internal (spa_history.c:450)
==305== by 0x591D5EC: spa_history_log_internal (spa_history.c:475)
==305== by 0x5902319: dsl_prop_set_sync (dsl_prop.c:707)
==305== by 0x5906A7D: dsl_sync_task_group_sync (dsl_synctask.c:199)
==305== by 0x58FF4EC: dsl_pool_sync (dsl_pool.c:376)
==305== by 0x591744C: spa_sync (spa.c:5365)
==305== by 0x5922C85: txg_sync_thread (txg.c:414)
2010-06-28 11:26:20 -07:00
882ec504ea
Minor ztest fixes
...
Move create/destroy function to correct places. I'm not sure why
this wasn't caught upstream it should have been, regardless let's
just fix it here.
Personally I find it handy to be able to enable full debugging in
zfs with the 'debug=' command line option so I'm enabled that as
well.
2010-06-28 11:23:50 -07:00
4970b635e8
Revert to original debugging
...
The ZFS defaults are fine, revert to them.
2010-06-28 10:58:16 -07:00
643eada5f6
Disable zero-copy in zpios
...
We need to update this code to use the new API. For now simply
comment it out until it can be correctly implemented.
2010-06-28 10:53:51 -07:00
f9a7332118
Update kmem_asprintf() and kmem_vasprintf() implementation
...
On a Linux system simply use the native aprintf and vasprintf
functions respectively. Also update the call points to correctly
use va_copy() or va_start() as appropriate.
2010-06-28 10:52:22 -07:00
5b02d6c084
Zero struct for zdb dump_block_stats
...
Accidentally dropped the zeroing of this structure in the
gcc-missing-braces topic branch which was causing a fall positive
space leak in ztest. Ensure the structure is zero'ed before use.
2010-06-28 10:48:24 -07:00
93664227c7
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-28 10:38:43 -07:00
ba79b0e3a3
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-28 10:38:41 -07:00
Brian Behlendorf