Commit Graph

2728 Commits

Author SHA1 Message Date
Brian Behlendorf 138205187e Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-07-12 10:25:07 -07:00
Brian Behlendorf 2c03b4439a Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-07-12 10:24:04 -07:00
Brian Behlendorf d134105bba Linux 2.6.34 compat: add_range() symbol collision
The prototype for an add_range() function was added to the kernel
header include/linux/range.h which conflicts with the static
add_range() defined in zfs_fm.c.  To resolve the conflict all
range functions in zfs_fm.c have been prefixed with zei which
is short for the zfs_ecksum_info struct since all of these
functions operate on that base structure.
2010-07-12 10:13:07 -07:00
Brian Behlendorf 9820fd89a4 Explicitly cast sizeof() to avoid format warnings
Simply explicity cast sizeof() to a 'long int' these numbers will
always be small and the removes all ambiguity.
2010-07-12 10:12:19 -07:00
Brian Behlendorf 3af0250f6d Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-07-02 12:26:06 -07:00
Brian Behlendorf 45cb33f64f Ensure devices are always created/removed
Devices were only being created at module load time or when a
dataset was created.  Similiar devices were not always being
removed at all the correct times.  This patch updates all the
places where devices should either be created or removed.  I'm
reasonably sure I got them all but if theres a case I missed
we can catch it with a follow up patch.

        module load/unload
        zfs create/remove
        zpool import/export
        zpool destroy

This patch also adds a simple regression test to zconfig.sh
to ensure zpool import/export is basically working properly.
This test specifically checks that devices are created
properly, removed after export, created after import, and
removed as a consequence of a zpool destroy.
2010-07-02 12:21:39 -07:00
Brian Behlendorf 122e5b44e1 Add missing mutex_exit(&zvol_state_lock)
With the recent ZVOL update zvol_set_volblocksize() accidentally
lost its mutex_exit().  This was noticed when zvol_create_minor()
blocked on the zvol_state_lock while it was holding the
spa_namespace_lock().  This caused everything to get blocked
up and hung the system.
2010-07-02 12:19:54 -07:00
Brian Behlendorf e983ee681f Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-29 16:59:40 -07:00
Brian Behlendorf 68a2ae2594 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-29 16:58:37 -07:00
Brian Behlendorf f5cb411fc1 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-29 16:58:01 -07:00
Brian Behlendorf 9c4837d5da Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-29 16:57:45 -07:00
Brian Behlendorf f28ca65b92 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-29 16:57:41 -07:00
Brian Behlendorf 5387c446cf Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-29 16:57:41 -07:00
Brian Behlendorf 015677660a Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch 2010-06-29 16:57:39 -07:00
Brian Behlendorf f20301b41b Minor fix to ensure tv_depth is there when debugging is disabled. 2010-06-29 16:52:42 -07:00
Brian Behlendorf 4e8b0b7409 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-29 11:13:48 -07:00
Brian Behlendorf a0e90a15ec Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-29 11:12:51 -07:00
Brian Behlendorf 68b79f258d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-29 11:12:17 -07:00
Brian Behlendorf a1ccea7c7f Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-29 11:12:03 -07:00
Brian Behlendorf 2eceb0c47a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-29 11:12:00 -07:00
Brian Behlendorf b0c8dc3c75 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-29 11:11:59 -07:00
Brian Behlendorf 46b2d46053 Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch 2010-06-29 11:04:51 -07:00
Brian Behlendorf 34229a2f2a Reduce stack usage for recursive traverse_visitbp()
Due to  limited stack space recursive functions are frowned upon in
the Linux kernel.  However, they often are the most elegant solution
to a problem.  The following code preserves the recursive function
traverse_visitbp() but moves the local variables AND function
arguments to the heap to minimize the stack frame size.  Enough
space is initially allocated on the stack for 20 levels of recursion.
This change does ugly-up-the-code but it reduces the worst case
usage from roughly 4160 bytes to 960 bytes on x86_64 archs.
2010-06-29 11:04:26 -07:00
Brian Behlendorf f13bc68113 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-29 11:01:46 -07:00
Brian Behlendorf b91da0086f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-29 11:00:47 -07:00
Brian Behlendorf 67850fa14f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-29 11:00:12 -07:00
Brian Behlendorf b8229898ab Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-29 10:59:58 -07:00
Brian Behlendorf 0a2b049259 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-29 10:59:54 -07:00
Brian Behlendorf ffeafc898e Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
2010-06-29 10:55:38 -07:00
Brian Behlendorf b873e71b0f Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-29 10:29:42 -07:00
Brian Behlendorf 192b36dcfd Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-29 10:25:31 -07:00
Brian Behlendorf 9cdd80e387 Revert traverse_impl() changes
These changes are now taken care of by the fix-stack-traverse_impl
topic branch which not only solves the uninit problem but also
moves these locals off the stack and on to the heap.
2010-06-29 10:24:14 -07:00
Brian Behlendorf 96bd9f434d Merge branch 'fix-stack-traverse_impl' into refs/top-bases/fix-branch 2010-06-29 10:21:53 -07:00
Brian Behlendorf 8e2de85a6d Reduce stack usage of traverse_impl()
Stack use reduced from 560 bytes to 128 bytes.
2010-06-29 10:21:21 -07:00
Brian Behlendorf 51a936233f Merge branch 'fix-stack-dsl_dataset_destroy' into refs/top-bases/fix-branch 2010-06-29 10:12:03 -07:00
Brian Behlendorf 7334572416 Reduce stack usage by dsl_dataset_destroy()
Move dsl_dataset_t local variable from the stack to the heap.
This reduces the stack usage of this function from 2048 bytes
to 176 bytes for x84_64 arches.
2010-06-29 10:11:32 -07:00
Brian Behlendorf b2313a226a Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-28 11:31:27 -07:00
Brian Behlendorf 759df09df2 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-28 11:31:03 -07:00
Brian Behlendorf 61adb3379a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-28 11:30:55 -07:00
Brian Behlendorf c02813baef Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-28 11:30:47 -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 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 18b75409bd Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-28 10:38:06 -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 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