Commit Graph

223 Commits

Author SHA1 Message Date
Brian Behlendorf 579f6e603f Remove incorrect mapping from verify to assert. We should be using the more correct version in lib/libzpool/include/sys/zfs_context.h which will not optimize out the actual call in the assert based on NDEBUG 2008-12-15 09:29:26 -08:00
Brian Behlendorf 228b31e100 Add va_list include 2008-12-15 09:27:38 -08:00
Brian Behlendorf 9e00f970ec Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-15 09:12:46 -08:00
Brian Behlendorf e1357f07c0 Add libshare.h stub 2008-12-15 09:10:33 -08:00
Brian Behlendorf b35bef8df2 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 16:29:31 -08:00
Brian Behlendorf 5e125dc8b1 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 16:28:28 -08:00
Brian Behlendorf 416157170a Resolve conflict 2008-12-12 16:25:01 -08:00
Brian Behlendorf 0e8ac26fc9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 16:23:07 -08:00
Brian Behlendorf 08a8860091 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-12 16:23:04 -08:00
Brian Behlendorf eee73dd80e Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-12 16:22:59 -08:00
Brian Behlendorf d0c573f27e Add in the reset of the pthread changes 2008-12-12 16:16:06 -08:00
Brian Behlendorf c264712b93 Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch 2008-12-12 16:09:33 -08:00
Brian Behlendorf d07c7914a0 Refresh context for assert 2008-12-12 16:02:48 -08:00
Brian Behlendorf 6c859b40d7 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 15:58:07 -08:00
Brian Behlendorf 0c575736b6 Make this primatives conditional to not conflict with context 2008-12-12 15:56:06 -08:00
Brian Behlendorf b978916b98 Merge branch 'linux-context' into refs/top-bases/linux-zfs-branch 2008-12-12 15:36:18 -08:00
Brian Behlendorf ac35c9f782 Minor verify tweak 2008-12-12 15:35:12 -08:00
Brian Behlendorf 7b363155b3 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-12 15:28:31 -08:00
Brian Behlendorf 5b4fa8eb54 Revert libzfs hunk 2008-12-12 15:26:39 -08:00
Brian Behlendorf a7b2b73c73 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 15:08:54 -08:00
Brian Behlendorf faf6c753bd Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 15:07:33 -08:00
Brian Behlendorf 2e7dffd82a Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 15:07:06 -08:00
Brian Behlendorf 3ce8541e83 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 15:06:41 -08:00
Brian Behlendorf d145044d80 Refresh Makefile 2008-12-12 15:04:48 -08:00
Brian Behlendorf 33ba2c56d1 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 14:57:48 -08:00
Brian Behlendorf d7556c1578 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 14:57:47 -08:00
Brian Behlendorf 9787903adb Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:57:13 -08:00
Brian Behlendorf dc19f8860e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 14:56:43 -08:00
Brian Behlendorf d3ed0c4920 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 14:56:18 -08:00
Brian Behlendorf f154348ca9 Update Makefile 2008-12-12 14:52:43 -08:00
Brian Behlendorf 8c4ed354ff Add missing header 2008-12-12 14:51:46 -08:00
Brian Behlendorf 67d05ea374 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 14:45:01 -08:00
Brian Behlendorf 1cdc368818 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 14:45:00 -08:00
Brian Behlendorf a955848091 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:44:30 -08:00
Brian Behlendorf 2085d7ed6e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 14:44:02 -08:00
Brian Behlendorf 17d90b5122 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 14:43:37 -08:00
Brian Behlendorf f981fad7c1 Add 5 missing headers 2008-12-12 14:41:45 -08:00
Brian Behlendorf cf89e6e4b3 Refresh Makefile 2008-12-12 14:37:13 -08:00
Brian Behlendorf 0dcb08e7fd Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 14:30:19 -08:00
Brian Behlendorf eb18d4f4b2 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:29:48 -08:00
Brian Behlendorf 1cac8533a1 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 14:29:21 -08:00
Brian Behlendorf 00fa98c5cf Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 14:28:56 -08:00
Brian Behlendorf 50532fe67b Refresh Makefile 2008-12-12 14:27:04 -08:00
Brian Behlendorf 2051c5740b Refresh Makefile 2008-12-12 14:26:14 -08:00
Brian Behlendorf e0db7f116d Resolve conflict 2008-12-12 14:22:23 -08:00
Brian Behlendorf 0adbfd4cfb Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:21:24 -08:00
Brian Behlendorf 948a4e0e2c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 14:20:55 -08:00
Brian Behlendorf 1bbe898289 Resolve conflict 2008-12-12 14:19:55 -08:00
Brian Behlendorf 5a27f3f0a5 Comment out libzpool builds for now 2008-12-12 14:16:50 -08:00
Brian Behlendorf 1c38136eed Resolve conflict 2008-12-12 14:08:10 -08:00
Brian Behlendorf 231e0793af Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:02:02 -08:00
Brian Behlendorf a5880e88af Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 14:01:34 -08:00
Brian Behlendorf 09f348197e Resolve conflict 2008-12-12 14:00:32 -08:00
Brian Behlendorf 01db09fde5 Collapse libzcommon in to libzpool 2008-12-12 13:57:47 -08:00
Brian Behlendorf a4fce46af9 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 13:52:44 -08:00
Brian Behlendorf d5c06eeec8 Revert mutex changes 2008-12-12 13:50:45 -08:00
Brian Behlendorf 058cbf020f Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 13:40:15 -08:00
Brian Behlendorf de9d49a2b4 Minor mutex tweaks 2008-12-12 13:38:13 -08:00
Brian Behlendorf ba611ca42d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 12:57:18 -08:00
Brian Behlendorf b127f72a15 Resolve mutex conflict 2008-12-12 12:55:33 -08:00
Brian Behlendorf ab95bc7c7b Add missing ; 2008-12-12 12:21:58 -08:00
Brian Behlendorf 9d0fe1b6d9 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 12:16:43 -08:00
Brian Behlendorf 1ff495a2cc Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 12:16:41 -08:00
Brian Behlendorf 3c0f20229e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 12:15:31 -08:00
Brian Behlendorf 4d9dd57c96 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 12:14:39 -08:00
Brian Behlendorf 4d2cd6e70a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 12:13:50 -08:00
Brian Behlendorf ac9f5a5af0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 12:13:43 -08:00
Brian Behlendorf 0f99484285 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-12 12:13:41 -08:00
Brian Behlendorf 95f0795156 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-12 12:13:39 -08:00
Brian Behlendorf 769681a8b9 Trivial umem implementation if portable umem unavailable 2008-12-12 12:10:00 -08:00
Brian Behlendorf ea6e9380e7 Add void to prototype 2008-12-12 11:12:11 -08:00
Brian Behlendorf bbaded4a68 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 11:07:48 -08:00
Brian Behlendorf 3088684851 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 11:07:20 -08:00
Brian Behlendorf 58d3c91fa2 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 11:06:52 -08:00
Brian Behlendorf 8a079bb853 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 11:06:29 -08:00
Brian Behlendorf ded433714f Refine Makefiles 2008-12-12 11:04:44 -08:00
Brian Behlendorf 33833181c1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 11:00:07 -08:00
Brian Behlendorf 08f2e57b8c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 10:59:38 -08:00
Brian Behlendorf 775b36b66c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:59:13 -08:00
Brian Behlendorf da10598d26 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:58:50 -08:00
Brian Behlendorf 9fbc572a59 Refine Makefiles 2008-12-12 10:57:05 -08:00
Brian Behlendorf bef1b1cd5b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:45:38 -08:00
Brian Behlendorf 266ab8c268 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 10:45:08 -08:00
Brian Behlendorf 9d5e714ca4 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:44:43 -08:00
Brian Behlendorf 8aff6b7eec Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:44:20 -08:00
Brian Behlendorf d7ec1ed532 Refine Makefiles 2008-12-12 10:43:39 -08:00
Brian Behlendorf 6d0d603ee1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:38:51 -08:00
Brian Behlendorf 92afe68367 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 10:38:23 -08:00
Brian Behlendorf 58842db464 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:37:58 -08:00
Brian Behlendorf d7761f89ae Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:37:35 -08:00
Brian Behlendorf 76e1c54125 Refine Makefiles 2008-12-12 10:36:14 -08:00
Brian Behlendorf 323d5b5414 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 10:30:38 -08:00
Brian Behlendorf d06634c325 Resolve shadow conflict with 'link' local 2008-12-12 10:24:38 -08:00
Brian Behlendorf 662df0d70a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-12 10:13:19 -08:00
Brian Behlendorf 30b11b1bb0 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 10:12:51 -08:00
Brian Behlendorf 9ca1163310 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-12 10:12:26 -08:00
Brian Behlendorf 9a4109a11c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 10:12:03 -08:00
Brian Behlendorf 6d78e69193 Add missing include patch 2008-12-12 10:10:16 -08:00
Brian Behlendorf 5664869614 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-12 09:34:35 -08:00
Brian Behlendorf 2e0a5f5461 Refresh makefiles and configure.ac 2008-12-12 09:30:42 -08:00