Commit Graph

171 Commits

Author SHA1 Message Date
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 b457fb49f9 Remove vdev_disk from userspace build, vdev_file is used 2009-01-08 10:23:59 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -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 29b47d366e Remove some headers 2008-12-22 14:42:02 -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 121effcbee Pull everything in to the Makefile 2008-12-22 12:51:03 -08:00
Brian Behlendorf 7047bb0678 Add missing files from Makefile.am 2008-12-22 11:36:48 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -08:00
Brian Behlendorf 60289ccd8f Add zfs_byteswap 2008-12-19 16:51:14 -08:00
Brian Behlendorf 96813619bf Pull in new background scrubber 2008-12-19 16:29:13 -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 e485017676 Remove spa_boot from userspace build 2008-12-19 12:04:45 -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 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 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 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 f799177730 Add all sources for libzfs userspace funcationality 2008-12-17 16:39:45 -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 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 a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -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 01db09fde5 Collapse libzcommon in to libzpool 2008-12-12 13:57:47 -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
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf 593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf f07f82e93a Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2008-12-11 11:26:43 -08:00
Brian Behlendorf 84e65c5c1e Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2008-12-11 11:25:50 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf 8f8ac4288f Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 11:25:09 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 77755a5771 Add a few missing files 2008-12-11 11:14:49 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00