Commit Graph

2784 Commits

Author SHA1 Message Date
Brian Behlendorf abdb22372d Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-07-22 16:57:59 -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 0d23904858 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-07-22 16:50:43 -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 2980a819e7 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-07-21 14:20:24 -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 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 e1c837497a Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-07-21 12:50:19 -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 d069265759 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-07-20 16:16:51 -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 b8ce701cb4 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-07-20 13:44:42 -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 858a597871 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-07-14 12:50:56 -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 e0d590aaf6 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-07-12 10:25:44 -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 ab661c1bd5 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-07-02 12:26:07 -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 d8c228876e Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-06-29 17:00:18 -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 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 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 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 4723cec18c Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2010-06-29 11:14:24 -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 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 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