Commit Graph

269 Commits

Author SHA1 Message Date
Brian Behlendorf 6791a1ee34 I don't think we need this in userspace 2009-01-09 15:07:32 -08:00
Brian Behlendorf 347805ecd8 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-09 14:46:45 -08:00
Brian Behlendorf d315fcf28e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 14:45:13 -08:00
Brian Behlendorf ff09d64647 Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches 2009-01-09 14:37:45 -08:00
Brian Behlendorf 9855548496 Refresh autogen products 2009-01-09 11:35:52 -08:00
Brian Behlendorf 2cc958820e Refresh autogen products 2009-01-08 10:42:46 -08:00
Brian Behlendorf 62ce1a5d0e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-08 10:29:29 -08:00
Brian Behlendorf b7d9adb500 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-08 10:27:42 -08:00
Brian Behlendorf b457fb49f9 Remove vdev_disk from userspace build, vdev_file is used 2009-01-08 10:23:59 -08:00
Brian Behlendorf 4996278dd4 Refresh autogen products 2009-01-05 13:48:29 -08:00
Brian Behlendorf 46d1c1ff3d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 13:47:32 -08:00
Brian Behlendorf 80ed6c342d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:06 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -08:00
Brian Behlendorf 9403f4a605 Refresh autogen products 2008-12-23 12:39:25 -08:00
Brian Behlendorf d8c0d57440 Refresh autogen products 2008-12-23 10:41:37 -08:00
Brian Behlendorf 50735743b7 Err undo that 2008-12-22 16:22:28 -08:00
Brian Behlendorf bb128e51e6 Use thread so we can add other goodies beyond simply the pthread base 2008-12-22 16:20:36 -08:00
Brian Behlendorf d46a4ba0dc Refresh autogen products 2008-12-22 14:55:05 -08:00
Brian Behlendorf f23a920ddd Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 14:45:48 -08:00
Brian Behlendorf ff8a2f61ff Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:07 -08:00
Brian Behlendorf 29b47d366e Remove some headers 2008-12-22 14:42:02 -08:00
Brian Behlendorf 75b5893ca5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 13:53:09 -08:00
Brian Behlendorf 05fafc638f Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 13:51:21 -08:00
Brian Behlendorf 90e5216ea9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 13:51:17 -08:00
Brian Behlendorf 035e4d373e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:16 -08:00
Brian Behlendorf c9597f9a4f Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 13:51:15 -08:00
Brian Behlendorf 6bed331e59 More compat changes 2008-12-22 13:47:58 -08:00
Brian Behlendorf d1178104fb Refresh autogen products 2008-12-22 12:55:48 -08:00
Brian Behlendorf d259de062c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:55:11 -08:00
Brian Behlendorf b93191445c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 12:53:27 -08:00
Brian Behlendorf 121effcbee Pull everything in to the Makefile 2008-12-22 12:51:03 -08:00
Brian Behlendorf 4f1e40767b Refresh autogen products 2008-12-22 11:46:00 -08:00
Brian Behlendorf 31ff40b9ec Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 11:42:32 -08:00
Brian Behlendorf aece7f6822 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:40:54 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 0e72235081 Refresh autogen products 2008-12-22 10:40:25 -08:00
Brian Behlendorf ebdd4dacfa Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 10:37:51 -08:00
Brian Behlendorf 9c47372b96 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 10:36:15 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -08:00
Brian Behlendorf 3b465d5229 Refresh autogen products 2008-12-19 17:05:29 -08:00
Brian Behlendorf fd8e8eb804 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 16:57:58 -08:00
Brian Behlendorf 4420db3d37 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 16:55:00 -08:00
Brian Behlendorf 60289ccd8f Add zfs_byteswap 2008-12-19 16:51:14 -08:00
Brian Behlendorf 1127f0dbbb Refresh autogen products 2008-12-19 16:36:58 -08:00
Brian Behlendorf 7ed56c768d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 16:36:18 -08:00
Brian Behlendorf 809ca413e5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 16:33:03 -08:00
Brian Behlendorf 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -08:00
Brian Behlendorf 3d2e368e7a Refresh autogen products 2008-12-19 16:12:00 -08:00
Brian Behlendorf 72838551b8 Refresh autogen products 2008-12-19 13:40:18 -08:00
Brian Behlendorf c311f43494 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 13:38:55 -08:00
Brian Behlendorf d1f5be0b8b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 13:37:23 -08:00
Brian Behlendorf 8ab575cd8e Remove vdev_disk.c from userspace build, we simply use vdev_file.c here 2008-12-19 13:35:29 -08:00
Brian Behlendorf 15f1c7fd8e Refresh autogen products 2008-12-19 12:12:02 -08:00
Brian Behlendorf ea7cab3c8e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 12:11:26 -08:00
Brian Behlendorf 3ce12f6815 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 12:08:24 -08:00
Brian Behlendorf e485017676 Remove spa_boot from userspace build 2008-12-19 12:04:45 -08:00
Brian Behlendorf 63a40005a1 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 10:20:03 -08:00
Brian Behlendorf 143bd1614e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 10:18:16 -08:00
Brian Behlendorf 9de4108779 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf 3e2e5c4535 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 10:18:12 -08:00
Brian Behlendorf a68af79057 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 10:18:11 -08:00
Brian Behlendorf d4c39af7a6 Re-add KM_PUSHPAGE 2008-12-19 10:15:52 -08:00
Brian Behlendorf 330840ff2e Re-add KM_PUSHPAGE 2008-12-19 10:15:27 -08:00
Brian Behlendorf 62f6c8fe77 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 09:54:53 -08:00
Brian Behlendorf 24e15d1bb1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 09:52:57 -08:00
Brian Behlendorf 2d0ae2710c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 09:52:53 -08:00
Brian Behlendorf 5906903384 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-19 09:52:52 -08:00
Brian Behlendorf 3d8832a795 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-19 09:52:51 -08:00
Brian Behlendorf 3bc48c3e74 Missing func readd 2008-12-19 09:50:15 -08:00
Brian Behlendorf 111303eeb8 context 2008-12-19 09:47:09 -08:00
Brian Behlendorf dbc567603d Readd removed hunk 2008-12-19 09:39:17 -08:00
Brian Behlendorf 3da25300e3 Refresh autogen products 2008-12-18 14:02:22 -08:00
Brian Behlendorf 896e89ac4a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 13:20:15 -08:00
Brian Behlendorf da1ceb2bbe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 13:18:27 -08:00
Brian Behlendorf 72bf32a79f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 13:18:19 -08:00
Brian Behlendorf 844a9ced6d Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-18 13:18:17 -08:00
Brian Behlendorf 33e499be43 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2008-12-18 13:18:15 -08:00
Brian Behlendorf 8e136cf0c9 Add noinline macro for userspace 2008-12-18 13:15:58 -08:00
Brian Behlendorf 0172b08863 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 10:03:25 -08:00
Brian Behlendorf 4d86e8fa92 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-18 10:01:44 -08:00
Brian Behlendorf 0a353443cd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-18 10:01:41 -08:00
Brian Behlendorf 9c0846462b Resolve conflict 2008-12-18 10:01:37 -08:00
Brian Behlendorf 4df7b421a1 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-18 10:00:46 -08:00
Brian Behlendorf 25a3fca866 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-18 10:00:45 -08:00
Brian Behlendorf 9e195d0cbf Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-18 10:00:44 -08:00
Brian Behlendorf c8f253cda8 Now fixed in fix-pthreads branch 2008-12-18 09:58:42 -08:00
Brian Behlendorf 229aba2943 Properly cast thread functions for pthreads 2008-12-18 09:56:22 -08:00
Brian Behlendorf 893ed2fad0 Properly cast thread functions for pthreads 2008-12-18 09:56:05 -08:00
Brian Behlendorf 1c78d7d61d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-18 09:36:25 -08:00
Brian Behlendorf fe5b927a4a Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-18 09:36:22 -08:00
Brian Behlendorf 0a6ac25d10 Add vmem_ interface mapping for user space 2008-12-18 09:34:27 -08:00
Brian Behlendorf e637016382 Refresh autogen products 2008-12-17 16:48:35 -08:00
Brian Behlendorf addd4c977d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:47:36 -08:00
Brian Behlendorf c27a2516c2 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 16:43:55 -08:00
Brian Behlendorf f799177730 Add all sources for libzfs userspace funcationality 2008-12-17 16:39:45 -08:00
Brian Behlendorf effc496583 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:37:56 -08:00
Brian Behlendorf e0f0e02636 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 11:36:22 -08:00
Brian Behlendorf 5ea99efac7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:36:20 -08:00
Brian Behlendorf 676ab35598 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:19 -08:00
Brian Behlendorf 0106dabb11 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-17 11:36:18 -08:00
Brian Behlendorf a681d70e28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:36:17 -08:00
Brian Behlendorf e532f6bef4 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:36:16 -08:00
Brian Behlendorf 8af904a4b0 Resolve index shadowing /usr/include/string.h:304 2008-12-17 11:34:19 -08:00
Brian Behlendorf ed9a35324d Not sure why Sun needed to remove these externs, but I need them back 2008-12-17 11:32:47 -08:00
Brian Behlendorf 7c5c932505 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 11:28:54 -08:00
Brian Behlendorf 01e5ef8ebe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 11:27:23 -08:00
Brian Behlendorf 25db7e9413 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-17 11:27:21 -08:00
Brian Behlendorf 935fd6c681 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-17 11:27:20 -08:00
Brian Behlendorf 55c8582174 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-17 11:27:19 -08:00
Brian Behlendorf dcf0fb9ffb Resolve shadow conflicts 2008-12-17 11:25:21 -08:00
Brian Behlendorf 994a616c30 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 09:50:58 -08:00
Brian Behlendorf 204ec2e8f4 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-17 09:50:56 -08:00
Brian Behlendorf bcbf74fead Remove assert/verify support from zfs_context, moved to assert.h 2008-12-17 09:49:02 -08:00
Brian Behlendorf d918e8e97d Refresh autogen products 2008-12-16 09:12:43 -08:00
Brian Behlendorf b7374fc81b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-16 09:06:51 -08:00
Brian Behlendorf 3ba34afff8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 09:02:49 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf bffca6c378 Refresh autogen products 2008-12-15 16:58:02 -08:00
Brian Behlendorf ee209a7614 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 16:30:32 -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 b7a979da7b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 16:09:38 -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 15218256e4 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 15:37:44 -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 d062bba879 Refresh autogen products 2008-12-12 14:10:01 -08:00
Brian Behlendorf 1102724082 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 14:08:17 -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 60a8ec8eeb Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 13:52: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 f7e63c25ea Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 13:40:17 -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 ffdd3b21d2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 12:57:20 -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 52de958498 Refresh autogen products 2008-12-12 12:17:51 -08:00
Brian Behlendorf 42c94f3b60 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 12:16:50 -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 ea6e9380e7 Add void to prototype 2008-12-12 11:12:11 -08:00