8aff93fb24
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-20 16:16:49 -07:00
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
25974dccd7
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-20 13:44:41 -07:00
ecf3f0b14f
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-20 13:44:40 -07:00
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
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
fc3325257f
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-17 16:06:25 -07:00
fb2898fc89
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-17 16:06:22 -07:00
3fab991620
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-17 16:06:17 -07:00
9be3d5bc25
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-17 16:06:15 -07:00
e62753d22a
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-17 16:06:10 -07:00
76c6e9ad7f
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-17 16:06:08 -07:00
25ac57e7e1
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-17 16:06:03 -07:00
09fa5102df
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-17 16:06:00 -07:00
6df6ba41fc
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-17 16:05:55 -07:00
3042984811
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-17 16:05:53 -07:00
df7f253ec0
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-17 16:05:48 -07:00
bcd7bf7fa3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-17 16:05:46 -07:00
334638aa6e
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-17 16:05:40 -07:00
8a5cb45557
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-17 16:05:38 -07:00
cf208a7801
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-17 16:05:33 -07:00
12f93084e3
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-17 16:05:31 -07:00
f03f3fdaab
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-17 16:05:25 -07:00
33dc7dfe40
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-17 16:05:23 -07:00
22de888edd
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-17 16:05:18 -07:00
c8d103431d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-17 16:05:16 -07:00
f728bfdb0d
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-17 16:05:11 -07:00
dba6ff35c4
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-17 16:05:09 -07:00
2259e385a9
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-17 16:05:03 -07:00
df51ecbf9b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-17 16:05:01 -07:00
bb886af0c6
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:56 -07:00
e03cc2e17f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-17 16:04:54 -07:00
efb7c67099
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:48 -07:00
e496029f2c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-17 16:04:46 -07:00
3641455fb0
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:41 -07:00
fadc6b7825
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-17 16:04:39 -07:00
a92799a80e
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:33 -07:00
a5243a987b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-17 16:04:31 -07:00
ef1ce6a643
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:25 -07:00
344668d944
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-17 16:04:23 -07:00
b9dd097bab
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:18 -07:00
52707cf42d
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-17 16:04:16 -07:00
84f737b448
Only try to unload modules whose use count is 0
...
This avoids errors from zfs.sh -u when, for example, zlib_deflate is in
use by btrfs.
2010-07-17 16:00:54 -07:00
57317cf0ee
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:55 -07:00
14f95cda3e
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-14 12:50:52 -07:00
2c69548c72
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:47 -07:00
6e6390e62c
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-14 12:50:45 -07:00
971793b651
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:40 -07:00
69cb20bf9c
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-14 12:50:38 -07:00
8b8aae4340
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-14 12:50:32 -07:00
Brian Behlendorf
Ricardo M. Correia
Ned Bass