Commit Graph

20049 Commits

Author SHA1 Message Date
Brian Behlendorf 16c1a92c74 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-07-21 10:08:56 -07:00
Brian Behlendorf d89ec19dc3 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-07-21 10:08:51 -07:00
Brian Behlendorf 94187a7875 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-07-21 10:08:49 -07:00
Brian Behlendorf 8ffae29655 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-07-21 10:08:43 -07:00
Brian Behlendorf 20479b4392 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-07-21 10:08:41 -07:00
Brian Behlendorf f777b812be Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-07-21 10:08:35 -07:00
Brian Behlendorf 67b27aa267 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-07-21 10:08:33 -07:00
Brian Behlendorf 230b75fe2d Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-07-21 10:08:28 -07:00
Brian Behlendorf 8a8a5ae7af Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-07-21 10:08:25 -07:00
Brian Behlendorf acd6237623 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-07-21 10:08:25 -07:00
Brian Behlendorf f39882ec1f Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-07-21 10:08:24 -07:00
Brian Behlendorf e16508d660 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-07-21 10:08:23 -07:00
Brian Behlendorf a2cf158872 Merge branch 'fix-stack-ztest' into refs/top-bases/fix-branch 2010-07-21 10:08:22 -07:00
Brian Behlendorf 8d6a2d0626 Merge commit 'refs/top-bases/fix-stack-ztest' into fix-stack-ztest 2010-07-21 10:08:22 -07:00
Ned Bass 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
Brian Behlendorf 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
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 fc3325257f Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch 2010-07-17 16:06:25 -07:00
Brian Behlendorf fb2898fc89 Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread 2010-07-17 16:06:22 -07:00
Brian Behlendorf 3fab991620 Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-07-17 16:06:17 -07:00
Brian Behlendorf 9be3d5bc25 Merge commit 'refs/top-bases/linux-topology' into linux-topology 2010-07-17 16:06:15 -07:00
Brian Behlendorf e62753d22a Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-07-17 16:06:10 -07:00
Brian Behlendorf 76c6e9ad7f Merge commit 'refs/top-bases/linux-sha2' into linux-sha2 2010-07-17 16:06:08 -07:00
Brian Behlendorf 25ac57e7e1 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-07-17 16:06:03 -07:00
Brian Behlendorf 09fa5102df Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-07-17 16:06:00 -07:00
Brian Behlendorf 6df6ba41fc Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-07-17 16:05:55 -07:00
Brian Behlendorf 3042984811 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-07-17 16:05:53 -07:00
Brian Behlendorf df7f253ec0 Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch 2010-07-17 16:05:48 -07:00
Brian Behlendorf bcd7bf7fa3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-07-17 16:05:46 -07:00
Brian Behlendorf 334638aa6e Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-07-17 16:05:40 -07:00
Brian Behlendorf 8a5cb45557 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-07-17 16:05:38 -07:00
Brian Behlendorf cf208a7801 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-07-17 16:05:33 -07:00
Brian Behlendorf 12f93084e3 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-07-17 16:05:31 -07:00
Brian Behlendorf f03f3fdaab Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-07-17 16:05:25 -07:00
Brian Behlendorf 33dc7dfe40 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-07-17 16:05:23 -07:00
Brian Behlendorf 22de888edd Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-07-17 16:05:18 -07:00
Brian Behlendorf c8d103431d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-07-17 16:05:16 -07:00
Brian Behlendorf f728bfdb0d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-07-17 16:05:11 -07:00
Brian Behlendorf dba6ff35c4 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-07-17 16:05:09 -07:00
Brian Behlendorf 2259e385a9 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-07-17 16:05:03 -07:00
Brian Behlendorf df51ecbf9b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-07-17 16:05:01 -07:00
Brian Behlendorf bb886af0c6 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-07-17 16:04:56 -07:00
Brian Behlendorf e03cc2e17f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-07-17 16:04:54 -07:00
Brian Behlendorf efb7c67099 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-07-17 16:04:48 -07:00
Brian Behlendorf e496029f2c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-07-17 16:04:46 -07:00