0d23904858
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-22 16:50:43 -07:00
0c1211f8fb
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-22 16:50:42 -07:00
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
14ea84687b
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-22 16:43:22 -07:00
36762cb6f6
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-22 16:43:21 -07:00
f39d7d2ca2
Remove libspl support for mlslabels
...
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 while I originally
added minimal support for this in libspl that was a mistake.
Supporting this under Linux is not required and this is
just additional troublesome code to support. Long term
something like this could be supported under Linux but it
will need to be clearly thought through them an implemented.
2010-07-22 16:37:29 -07:00
2980a819e7
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-21 14:20:24 -07:00
7e004b0643
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-21 14:20:23 -07:00
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
e1c837497a
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-21 12:50:19 -07:00
39f3185fed
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-21 12:50:17 -07:00
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
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
5951864035
Minor formatting fix to align columns
...
$ sudo ./cmd/zpool/zpool events
TIME CLASS
Jul 21 2010 11:36:14.682122000 resource.fs.zfs.statechange
Jul 21 2010 11:36:14.705809000 resource.fs.zfs.statechange
2010-07-21 12:51:07 -07:00
35d3729682
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-21 10:10:38 -07:00
8f23f1289e
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-21 10:10:37 -07:00
5a09148ef7
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-21 10:10:35 -07:00
0547af7680
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-21 10:10:29 -07:00
b5ffd516ba
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-21 10:10:27 -07:00
4843c4584b
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-21 10:10:22 -07:00
a124e00e39
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-21 10:10:20 -07:00
98d671d37e
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-21 10:10:15 -07:00
05126a5b3e
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-21 10:10:13 -07:00
87537f7372
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-21 10:10:07 -07:00
b37d279269
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-21 10:10:05 -07:00
5db9386acb
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-21 10:10:00 -07:00
47ae2dcfd3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-21 10:09:58 -07:00
cb2ae59cac
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-21 10:09:52 -07:00
79cacc44aa
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-21 10:09:50 -07:00
d993033036
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-21 10:09:45 -07:00
d0b0beb358
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-21 10:09:42 -07:00
dfd049ded5
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-21 10:09:37 -07:00
c665456598
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-21 10:09:35 -07:00
e793008d28
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-21 10:09:29 -07:00
4354e9bfe1
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-21 10:09:27 -07:00
28c54731ed
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-21 10:09:22 -07:00
6067ed4272
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-21 10:09:20 -07:00
e2b2fb1e49
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-21 10:09:14 -07:00
2bff95ac4a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-21 10:09:12 -07:00
4d94fa22be
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-21 10:09:07 -07:00
064837c20a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-21 10:09:04 -07:00
9a0ad28baa
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-21 10:08:59 -07:00
16c1a92c74
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-21 10:08:56 -07:00
d89ec19dc3
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-21 10:08:51 -07:00
94187a7875
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-21 10:08:49 -07:00
8ffae29655
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-21 10:08:43 -07:00
20479b4392
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-21 10:08:41 -07:00
f777b812be
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-21 10:08:35 -07:00
67b27aa267
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-21 10:08:33 -07:00
230b75fe2d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-21 10:08:28 -07:00
Brian Behlendorf