Commit Graph

2885 Commits

Author SHA1 Message Date
Brian Behlendorf
8a2017515b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-08-02 13:23:32 -07:00
Brian Behlendorf
73759365d7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-08-02 13:22:22 -07:00
Brian Behlendorf
1f3c757320 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-08-02 13:22:13 -07:00
Brian Behlendorf
37e5e668d6 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-08-02 13:21:57 -07:00
Brian Behlendorf
0fee5e7ac8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-08-02 13:21:53 -07:00
Brian Behlendorf
7b8a233029 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-08-02 13:21:52 -07:00
Brian Behlendorf
bb064e0220 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-08-02 13:21:51 -07:00
Ricardo M. Correia
4ca4dfe9bb Fix taskq_dispatch() call in zio_taskq_dispatch().
The feature branch 'fix-taskq' in Linux's ZFS tree changes the taskq_dispatch()
flag from TQ_SLEEP to TQ_NOSLEEP to avoid sleeping in some circumstances.

However, this has the side effect that taskq_dispatch() now may fail, and since
the return code was not even being checked, it could lead to zio's not being
scheduled to execute.

I'm fixing this in a simplistic but not very elegant way, by just looping until
taskq_dispatch() succeeds.

Signed-off-by: Ricardo M. Correia <ricardo.correia@oracle.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-08-02 13:12:54 -07:00
Brian Behlendorf
f58729aa42 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-08-02 12:54:55 -07:00
Brian Behlendorf
7195d18e6a Reduce stack using in ZVOL
The dmu_object_info_t structures which are roughly 60 bytes
have been moved from the stack to the heap.  Every little
bit helps and there's absolutely no reason these temporary
working variables need to be on the stack.
2010-08-02 11:51:21 -07:00
Brian Behlendorf
88b37fbe57 Fix zvol_init() lock inversion
During module load we could deadlock because the zvol_init()
callpath took the spa_namespace_lock before the zvol_state_lock.
The rest of the zvol code takes the locks in the opposite order.
In particular, I observed the following deadlock cause by the
lock inversion.

I've fixed the ording by creating an unlocked version of
zvol_create_minor and zvol_remove_minor.  This allows me to
take the zvol_state_lock before the spa_namespace_lock in
zvol_cr_minors_common and simply call the unlocked version.
2010-08-02 11:50:04 -07:00
Brian Behlendorf
f162433deb Minor device creation/removal (Kernel)
With the update to onnv_141 how minor devices were created and
removed for ZVOL was substantially changed.  The updated system
is much more tightly integrated with Solaris's /dev/ filesystem.
This is great for Solaris but bad for Linux.

On the kernel side the ZFS_IOC_{CREATE,REMOVE}_MINOR ioctl
entry points have been re-added.  They now call directly in
to the ZVOL to create the needed minor node and add the sysfs
entried for udev.

Also as part of this change I've decided it would really be
best if all the zvols were in a /dev/zvol directory like on
Solaris.  Organizationally this makes sense and on the code
side it allows us to know a block device is a zvol simply by
where it is located in /dev/.  Unless Solaris there still is
to ./dsk or ./rdsk as part of the path.
2010-08-02 11:49:08 -07:00
Brian Behlendorf
2c0f0b6068 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-07-28 16:53:58 -07:00
Brian Behlendorf
e01317ed8c Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-07-28 16:52:47 -07:00
Brian Behlendorf
96ae916dbe Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-07-28 16:52:38 -07:00
Brian Behlendorf
1f1212fc5f Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-07-28 16:52:22 -07:00
Brian Behlendorf
9662934bd9 Add uninstall Makefile targets
Extend the Makefiles with an uninstall target to cleanly
remove a package which was installed with 'make install'.

Additionally, ensure a 'depmod -a' is run as part of the
install to update the module dependency information.
2010-07-28 16:47:26 -07:00
Brian Behlendorf
45fab7f26c Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch 2010-07-27 09:51:16 -07:00
Ricardo M. Correia
2a9e09ec68 Export DMU/ZFS symbols required by Lustre
The dmu_objset_pool() and dmu_objset_name() symbols are needed
by Lustre and should be exported.

Signed-off-by: Ricardo M. Correia <ricardo.correia@oracle.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-27 09:46:23 -07:00
Brian Behlendorf
bda31592bf Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch 2010-07-22 16:57:57 -07:00
Brian Behlendorf
66b2805477 Disable mlslabel support in Linux
The ZFS update to onnv_141 brought with it support for a
security label attribute called mlslabel.  This feature
depends on zones to work correctly and thus I am disabling
it under Linux.  Equivilant functionality could be added
at some point in the future.
2010-07-22 16:55:50 -07:00
Brian Behlendorf
0c1211f8fb Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-07-22 16:50:42 -07:00
Brian Behlendorf
c979e4bdf8 Move mlslabel hunk to new linux-have-mlslabel
Simply relocate this hunk with a little tweak to the new
linux-have-mlslabel topic branch which has been created to
disable this support on linux.
2010-07-22 16:46:27 -07:00
Brian Behlendorf
0e533b7459 Best effort for minor device removal.
We should just make a best effort when removing zvol minors
from the system during destroy.  Failure here should never
prevent the pool from being destroyed.  For example, if a
pool is so heavily damaged it cannot be opened (part of the
minor removal) we still want to be able to destroy it.  The
worst case here is we may orphan a few minors but even that
is unlikely and not particularly harmful.
2010-07-21 14:20:56 -07:00
Brian Behlendorf
7e004b0643 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-07-21 14:20:23 -07:00
Brian Behlendorf
39f3185fed Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-07-21 12:50:17 -07:00
Brian Behlendorf
1a493a9555 Add vdev_state to common post info
This was done because there are now lots of resource.fs.zfs.statechange
events being posted but they do not include the state.  For the moment
the state must always be healthy but there's no harm in making this
explicit.
2010-07-21 12:51:14 -07:00
Brian Behlendorf
f275e82de9 Add FM_EREPORT_TIME when event is posted
Previously I was adding the FM_EREPORT_TIME time when the nvlist
was constructed.  However, with the update to onnv_141 these
ereport nvlists are now constructed in several places and it
doesn't make sense for each of them to have to add this common
bit of info.  To handle this the FM_EREPORT_TIME is now only
added once when the event is posted.
2010-07-21 12:51:11 -07:00
Brian Behlendorf
8aff93fb24 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-07-20 16:16:49 -07:00
Ricardo M. Correia
10d4848350 Display DEBUG keyword during module load when --enable-debug is used.
Just to be clear this only indicates that the ZFS code was built
with or without debugging enabled.  It says nothing about about
how the SPL was built, they can be build differently by design.

Signed-off-by: Ricardo M. Correia <ricardo.correia@oracle.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-20 16:16:44 -07:00
Brian Behlendorf
25974dccd7 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-07-20 13:44:41 -07:00
Brian Behlendorf
ecf3f0b14f Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-07-20 13:44:40 -07:00
Brian Behlendorf
99d3042bc8 Update to use reworked SPL debugging
This change updates the ZFS code to use the slightly reworked
SPL debug infrastructure.  It also explicitly sets all ZFS
dprintf debugging to use the SS_USER1 subsystem for logging
in the SPL debug log.
2010-07-20 13:39:28 -07:00
Brian Behlendorf
49c7595ad8 Replace SBUG with PANIC macro
The SBUG macro has been removed from the SPL and replaced
with PANIC which is closer to an existing API.  Simply
update the usage in vdev_disk.c.
2010-07-20 13:36:50 -07:00
Brian Behlendorf
26fe533aaf Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-07-14 12:49:01 -07:00
Brian Behlendorf
fc3e47c6d4 Corrently handle return code in blk_end_request_x
This was caught under Debian Lenny builds because they are one of
the few/only current distros based on a 2.6.26 kernel.  In one
of the build conditionals I accidently failed to assign the
return code to rc before returning.
2010-07-14 12:45:16 -07:00
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
ef488d53dd Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-29 16:59:31 -07:00
Brian Behlendorf
f1f5c3783c Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-29 16:59:22 -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
3b0e8e41d1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-29 16:58:10 -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
068b74a60e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-29 16:57:52 -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
5387c446cf Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-29 16:57:41 -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
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
3658e74315 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-29 11:13:41 -07:00
Brian Behlendorf
7b10b97c18 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-29 11:13:32 -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
91023a3daf Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-29 11:12:26 -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
e52951a257 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-29 11:12:09 -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
f281cb3d2d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-29 11:01:37 -07:00
Brian Behlendorf
0576c0ce91 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-29 11:01:29 -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
c2e6290a45 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-29 11:00:21 -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
120e89d397 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-29 11:00:04 -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
ca22294794 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-28 10:37:58 -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
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
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
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
8ec85f8aee Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch 2010-06-28 10:36:17 -07:00
Brian Behlendorf
1a967e146f Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-06-28 10:36:16 -07:00
Brian Behlendorf
df8d7829a8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-28 10:36:13 -07:00
Brian Behlendorf
ef3ec1c9ed Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-28 10:36:11 -07:00
Brian Behlendorf
52bb0d8e75 Ensure zio_bad_cksum_t is initialized
This may not strictly be needed but it does keep gcc happy.  We
should keep our eye on this though if the extra bcopy significantly
impacts performance.  It may.
2010-06-28 10:30:38 -07:00
Brian Behlendorf
5b1f2041e5 Silence 3 additional large kmem warnings
The following are 3 cases where move than 2 pages are allocated
with a kmem_alloc()... but not a lot more.  For now we just disable
the warning with KM_NODEBUG and this can be revisted latter to
see if it's worth shrinking the allocation or perhaps moving it
to a slab.
2010-06-28 10:23:42 -07:00
Brian Behlendorf
d6ea5e8cef Additional ZVOL cleanup in zvol_set_volsize()
The following cleanup was missed in the first pass when the ZVOL
implementation was updated.  An extra instance of a zvol_state_t
was removed from the stack and the error handling was simplified.
2010-06-28 10:21:24 -07:00
Brian Behlendorf
6914386b85 Never sleep under taskq_dispatch()
There are cases where under Linux it is not safe to sleep in
taskq_dispatch().  Rather than adding Linux specific code to
detect these cases I opted to keep it simple and just never
allow a sleep here.  The impact of this should be minimal.
2010-06-28 10:11:12 -07:00
Brian Behlendorf
0c11631b02 Fix for fix-stack-dmu_objset_snapshot should be 'sn' not '&sn'
I missed a instanse of removing the & operator when reducing the
stack usage in this function.  This unfortunately doesn't cause
a compile warning but it is does cause ztest failures.  Anyway,
update the topic branch to correct this mistake.
2010-06-28 10:06:29 -07:00
Brian Behlendorf
e780aad257 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-06-21 22:01:57 -07:00
Brian Behlendorf
06376e3a0e Revert linux-debug-zerocopy real ZC support added 2010-06-21 21:39:06 -07:00
Brian Behlendorf
53e9660c56 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-16 14:45:03 -07:00
Brian Behlendorf
5cac48ae66 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-16 14:45:02 -07:00
Brian Behlendorf
5a46abc9a0 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-16 14:44:50 -07:00
Brian Behlendorf
18ead3a526 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-16 14:44:43 -07:00
Brian Behlendorf
67c6255292 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 14:44:05 -07:00
Brian Behlendorf
76ad38b271 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-16 14:43:43 -07:00
Brian Behlendorf
4aba89bb16 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-16 14:43:35 -07:00
Brian Behlendorf
4af4558675 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-16 14:43:26 -07:00
Brian Behlendorf
8645a8e901 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 14:43:21 -07:00
Brian Behlendorf
2f457b7bd0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 14:43:17 -07:00
Brian Behlendorf
8de2671680 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 14:43:17 -07:00
Brian Behlendorf
6504afae4a Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch 2010-06-16 14:39:41 -07:00
Brian Behlendorf
e163b08ba3 Add fix-stack-dmu_objset_snapshot topic branch
Reduce stack usage by 276 bytes by moving the snaparg struct from the
stack to the heap.  We have limited stack space we must not waste.
2010-06-16 14:39:06 -07:00
Brian Behlendorf
a2ba5b83f8 Merge branch 'fix-stack-noinline' into refs/top-bases/fix-branch 2010-06-16 14:35:14 -07:00
Brian Behlendorf
bbdb8184ec Add fix-stack-noinline topic branch
Certain function must never be automatically inlined by gcc because
they are stack heavy or called recursively.  This patch flags all
such functions I have found as 'noinline' to prevent gcc from making
the optimization.
2010-06-16 14:34:41 -07:00
Brian Behlendorf
f956c97dc3 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-16 14:29:17 -07:00
Brian Behlendorf
f83c9f790e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-16 14:29:16 -07:00
Brian Behlendorf
9513d614a5 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-16 14:29:05 -07:00
Brian Behlendorf
29df979686 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-16 14:28:57 -07:00
Brian Behlendorf
d30e62105f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 14:28:19 -07:00
Brian Behlendorf
17edc470ca Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-16 14:27:56 -07:00
Brian Behlendorf
850510ee8f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-16 14:27:48 -07:00
Brian Behlendorf
b76cabbeaf Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-16 14:27:40 -07:00
Brian Behlendorf
76f112175f Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 14:27:35 -07:00
Brian Behlendorf
48ca6d3590 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 14:27:31 -07:00
Brian Behlendorf
7f979b27f4 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-16 14:27:30 -07:00
Brian Behlendorf
30c03a0914 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2010-06-16 14:27:29 -07:00
Brian Behlendorf
2115c30515 Revert fix-stack topic branch
This patch will be broken in to several independent stack reductions
and reapplied as new topic branches.
2010-06-16 14:23:31 -07:00
Brian Behlendorf
e536586568 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-16 13:54:49 -07:00
Brian Behlendorf
37dfa2ca00 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-16 13:54:48 -07:00
Brian Behlendorf
16dd4c6bb3 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-16 13:54:37 -07:00
Brian Behlendorf
56b4546e2c Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-16 13:54:30 -07:00
Brian Behlendorf
38f71c17a7 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-16 13:53:55 -07:00
Brian Behlendorf
9cebf85651 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-16 13:53:32 -07:00
Brian Behlendorf
2084051282 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-16 13:53:24 -07:00