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
acd6237623
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-07-21 10:08:25 -07:00
8a8a5ae7af
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-21 10:08:25 -07:00
f39882ec1f
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-07-21 10:08:24 -07:00
e16508d660
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-07-21 10:08:23 -07:00
a2cf158872
Merge branch 'fix-stack-ztest' into refs/top-bases/fix-branch
2010-07-21 10:08:22 -07:00
8d6a2d0626
Merge commit 'refs/top-bases/fix-stack-ztest' into fix-stack-ztest
2010-07-21 10:08:22 -07:00
75d868af70
Fixed typo that set thread STACK_SIZE to 24k instead of 8k
...
__linux__ was mispelled as _linux_ so #ifdef was always
selecting the Solaris STACK_SIZE value.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-21 10:04:21 -07:00
6d72cb7326
Fix pthread stack size on 32-bit platforms
...
For some reason which remains mysterious to me the shared library
which calls pthread_create() must be linked with -pthread. If this
is not done on 32-bit system the default ulimit stack size is used.
Surprisingly, on a 64-bit system the stack limit specified by the
pthread_attr is honored even when -pthread is not passed when linking
the shared library.
2010-07-21 09:59:39 -07:00
a89b017c7a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-20 16:16:52 -07:00
d069265759
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-20 16:16:51 -07:00
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
41c051725d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-20 13:44:45 -07:00
b8ce701cb4
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-20 13:44:42 -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
5f78450b86
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-17 16:06:27 -07:00
cca9361a36
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-07-17 16:06:26 -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
Brian Behlendorf
Ned Bass
Ricardo M. Correia