Commit Graph

19759 Commits

Author SHA1 Message Date
Brian Behlendorf 17a1689bd4 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-28 11:30:35 -07:00
Brian Behlendorf 9a29d55b2f Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-06-28 11:30:34 -07:00
Brian Behlendorf c2793dd0c7 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2010-06-28 11:30:34 -07:00
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 4970b635e8 Revert to original debugging
The ZFS defaults are fine, revert to them.
2010-06-28 10:58:16 -07:00
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf c8b2451d0b Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch 2010-06-28 10:38:40 -07:00
Brian Behlendorf 5a3e91cb5c Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread 2010-06-28 10:38:37 -07:00
Brian Behlendorf c26b7f3538 Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-06-28 10:38:32 -07:00
Brian Behlendorf 5f0e728052 Merge commit 'refs/top-bases/linux-topology' into linux-topology 2010-06-28 10:38:29 -07:00
Brian Behlendorf 4a19aafcef Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-06-28 10:38:24 -07:00
Brian Behlendorf 02ffef0481 Merge commit 'refs/top-bases/linux-sha2' into linux-sha2 2010-06-28 10:38:22 -07:00
Brian Behlendorf d1798fd399 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-06-28 10:38:16 -07:00
Brian Behlendorf fc19ad74ed Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-06-28 10:38:14 -07:00
Brian Behlendorf c7763d33d4 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-28 10:38:08 -07:00
Brian Behlendorf 18b75409bd Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-28 10:38:06 -07:00
Brian Behlendorf a2bf0e7a8b Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch 2010-06-28 10:38:00 -07:00
Brian Behlendorf ca22294794 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-28 10:37:58 -07:00
Brian Behlendorf 25e82fa1af Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-06-28 10:37:52 -07:00
Brian Behlendorf 670e4c64ca Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-28 10:37:50 -07:00
Brian Behlendorf 7e9c7c8d71 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-06-28 10:37:45 -07:00
Brian Behlendorf 6282a7704f Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-06-28 10:37:43 -07:00
Brian Behlendorf 00f9aa53e0 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-06-28 10:37:37 -07:00
Brian Behlendorf d71f53ece7 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-06-28 10:37:34 -07:00
Brian Behlendorf 888b72c614 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-06-28 10:37:29 -07:00
Brian Behlendorf 5a80c173cd Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-06-28 10:37:27 -07:00
Brian Behlendorf d3c37d45e6 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-06-28 10:37:21 -07:00
Brian Behlendorf 2a2492e105 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-28 10:37:19 -07:00
Brian Behlendorf c227476f72 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-28 10:37:13 -07:00
Brian Behlendorf 9e841db04c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-28 10:37:11 -07:00
Brian Behlendorf ce981e8b1f Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-28 10:37:05 -07:00
Brian Behlendorf 37e52074e8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-28 10:37:03 -07:00
Brian Behlendorf bc70b08afa Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-06-28 10:36:57 -07:00
Brian Behlendorf 235abcb965 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-06-28 10:36:55 -07:00
Brian Behlendorf 0fc35eb24e Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-28 10:36:49 -07:00
Brian Behlendorf 6107ded5d5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-28 10:36:47 -07:00
Brian Behlendorf 07eb43b53a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-28 10:36:41 -07:00
Brian Behlendorf a6411d4033 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-28 10:36:38 -07:00
Brian Behlendorf c11253760f Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-28 10:36:33 -07:00
Brian Behlendorf 03eab0c703 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-28 10:36:30 -07:00
Brian Behlendorf 712dbf737f Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-28 10:36:24 -07:00
Brian Behlendorf cecd65c15b Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-28 10:36:21 -07:00
Brian Behlendorf 744af7fa00 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-28 10:36:20 -07:00
Brian Behlendorf 191d5e833a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-28 10:36:19 -07:00
Brian Behlendorf e8eea67f41 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-28 10:36:18 -07:00
Brian Behlendorf 8ec85f8aee Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch 2010-06-28 10:36:17 -07:00
Brian Behlendorf ee53c67258 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2010-06-28 10:36:17 -07:00