Commit Graph

343 Commits

Author SHA1 Message Date
Brian Behlendorf 188291aa77 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-16 14:55:53 -08:00
Brian Behlendorf cf839c012a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-16 14:54:34 -08:00
Brian Behlendorf 5bf49743a6 Add minor root check for convenience 2009-01-16 14:51:52 -08:00
Brian Behlendorf 1ede1f1f93 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-16 14:33:21 -08:00
Brian Behlendorf e77bb8debf Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-16 14:32:59 -08:00
Brian Behlendorf 681d703126 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-16 14:31:41 -08:00
Brian Behlendorf 6a6da5a14d Minor verbage cleanup 2009-01-16 14:29:31 -08:00
Brian Behlendorf 21434a0b3f Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-16 14:00:53 -08:00
Brian Behlendorf fc48083154 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-16 14:00:30 -08:00
Brian Behlendorf 7b5ceef9df Minor fixes 2009-01-16 13:57:12 -08:00
Brian Behlendorf 87d7387f62 Minor fixes 2009-01-16 13:56:14 -08:00
Brian Behlendorf 71c6ba8698 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-16 13:29:23 -08:00
Brian Behlendorf ae9df6c1c6 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-16 13:29:01 -08:00
Brian Behlendorf 89ed048230 Minor script updates almost ready to test 2009-01-16 13:25:47 -08:00
Brian Behlendorf e7b183b7f2 Minor script updates almost ready to test 2009-01-16 13:25:16 -08:00
Brian Behlendorf c5097bc792 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-16 12:57:42 -08:00
Brian Behlendorf c582d80811 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-16 12:57:20 -08:00
Brian Behlendorf 4a56333c4c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-16 12:55:58 -08:00
Brian Behlendorf 7c761d45a8 Further work towards getting zpool-create working 2009-01-16 12:53:12 -08:00
Brian Behlendorf 2d9ebe2d08 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-16 12:27:21 -08:00
Brian Behlendorf 0289edb7e6 Update to use the zpool-create.sh script 2009-01-16 12:23:53 -08:00
Brian Behlendorf 7c98f76d30 Update zpios infrastructure to be more flexible 2009-01-16 12:19:15 -08:00
Brian Behlendorf da9f36856e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-16 12:13:43 -08:00
Brian Behlendorf cfabdf6bda Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-16 12:13:03 -08:00
Brian Behlendorf 9b3a269da4 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-16 12:10:27 -08:00
Brian Behlendorf b38eb997f4 Update helper scripts to me more helpful 2009-01-16 12:06:25 -08:00
Brian Behlendorf 8d87f5aba5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-15 10:18:25 -08:00
Brian Behlendorf 62895cf669 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 10:18:00 -08:00
Brian Behlendorf b487be0ca1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 10:16:36 -08:00
Brian Behlendorf 6932f09bb5 Reference module not modules in SPL for consistency 2009-01-15 10:14:21 -08:00
Brian Behlendorf 87fc3feb38 Refresh autogen products 2009-01-14 16:09:39 -08:00
Brian Behlendorf 6d0121d8de Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 16:05:29 -08:00
Brian Behlendorf 9339984f08 Resolve conflict 2009-01-14 16:04:33 -08:00
Brian Behlendorf 9e40470aa0 Resolve conflict 2009-01-14 15:42:28 -08:00
Brian Behlendorf 9c22d76019 Minor 'make check' updates 2009-01-14 15:38:56 -08:00
Brian Behlendorf 8778a30cda Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 10:42:47 -08:00
Brian Behlendorf e090338e7b Update zpios script 2009-01-14 10:40:50 -08:00
Brian Behlendorf 0ba5ba5928 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 10:01:14 -08:00
Brian Behlendorf bbd8816aff Add missing echo 2009-01-14 09:59:10 -08:00
Brian Behlendorf bb39dca861 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 09:20:14 -08:00
Brian Behlendorf b0bf494b37 Refresh script to handle errors (missing stat files) more gracefully, additionally lengthen the default test to a useful length 2009-01-14 09:18:16 -08:00
Brian Behlendorf 0817cfaa4b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-14 08:42:39 -08:00
Brian Behlendorf 1194e0412f Change all instances of kpios to zpios 2009-01-14 08:38:35 -08:00
Brian Behlendorf 4ab6c5a787 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-13 11:58:07 -08:00
Brian Behlendorf b8761b72ba Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 11:57:49 -08:00
Brian Behlendorf bba6e9829d Handle the case when 'module-name=' is passed down without args. This is handy and shouldn't generate warnings 2009-01-13 11:54:38 -08:00
Brian Behlendorf 6caf53f208 Minor script update 2009-01-13 11:53:51 -08:00
Brian Behlendorf 7d9e65d7e1 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-13 11:18:14 -08:00
Brian Behlendorf 7356c2045e Update zpios.sh script to reference zfs not zpool, additionally remove unneed module load console message 2009-01-13 11:16:12 -08:00
Brian Behlendorf d2acaf11ef Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-09 13:34:52 -08:00
Brian Behlendorf 82d446c832 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-09 13:34:34 -08:00
Brian Behlendorf bf5a93e1ec Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 13:33:14 -08:00
Brian Behlendorf 04638ead67 Change zpool module name to zfs and update references 2009-01-09 13:31:16 -08:00
Brian Behlendorf 9855548496 Refresh autogen products 2009-01-09 11:35:52 -08:00
Brian Behlendorf 78986fd642 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-08 16:57:29 -08:00
Brian Behlendorf 7b4f45a7fc Update zpios.sh to use zfs.sh plus error handling 2009-01-08 16:53:29 -08:00
Brian Behlendorf a54bab4825 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-08 16:28:52 -08:00
Brian Behlendorf 0270ffced8 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-08 16:28:08 -08:00
Brian Behlendorf 85d3e34d3d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-08 16:25:03 -08:00
Brian Behlendorf cd0b9c18b7 Update helper scripts 2009-01-08 16:20:25 -08:00
Brian Behlendorf 0e5efe5ab4 Update helper scripts 2009-01-08 16:19:38 -08:00
Brian Behlendorf b9bba7db62 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-08 11:01:58 -08:00
Brian Behlendorf 7681ddef00 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-08 11:01:37 -08:00
Brian Behlendorf 4802584080 Update execute permissions 2009-01-08 10:57:24 -08:00
Brian Behlendorf 9f7833f915 Update execute permissions 2009-01-08 10:56:53 -08:00
Brian Behlendorf 8fd8d8a2fd Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 12:13:17 -08:00
Brian Behlendorf ddcdf90ceb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-05 12:12:33 -08:00
Brian Behlendorf 888028c161 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 12:09:13 -08:00
Brian Behlendorf 07c6176130 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 12:09:06 -08:00
Brian Behlendorf 42bcb36c89 Add unicode library 2009-01-05 12:03:23 -08:00
Brian Behlendorf 6a73d9f6b2 Remove zdump.c 2009-01-05 11:17:09 -08:00
Brian Behlendorf 3767655021 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-05 11:16:11 -08:00
Brian Behlendorf ef0ca51855 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 11:14:50 -08:00
Brian Behlendorf 578a1db888 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-05 11:11:56 -08:00
Brian Behlendorf 36b849fa51 Remove zdump, it's an unrelateds command which I added simply due to the z* command convention 2009-01-05 11:10:13 -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 3d2e368e7a Refresh autogen products 2008-12-19 16:12:00 -08:00
Brian Behlendorf bffca6c378 Refresh autogen products 2008-12-15 16:58:02 -08:00
Brian Behlendorf e859b8f5f2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-15 10:31:44 -08:00
Brian Behlendorf 6bea798e15 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-15 10:31:35 -08:00
Brian Behlendorf b3b77e63be Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-15 10:30:11 -08:00
Brian Behlendorf e631cff898 Remove lustre config, we really shouldn't need this. A user space build -should- be able to contain all the needed APIs. If this is not the case we can reintroduce this. 2008-12-15 10:28:14 -08:00
Brian Behlendorf ff56741803 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-12 13:48:28 -08:00
Brian Behlendorf 2f484dd74c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-12 13:48:20 -08:00
Brian Behlendorf 1e5d1c3168 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 13:47:00 -08:00
Brian Behlendorf 9ba40d2bfa Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 13:46:57 -08:00
Brian Behlendorf 810db7e0a2 Remove zcommon reference merged in to zpool 2008-12-12 13:41:20 -08:00
Brian Behlendorf 3b4adb0abd Add all autogen products 2008-12-12 09:25:06 -08:00
Brian Behlendorf 42572599e3 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-11 16:35:36 -08:00
Brian Behlendorf 6535464bdb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-11 16:35:30 -08:00
Brian Behlendorf a0914f2770 Refresh 2008-12-11 16:31:44 -08:00
Brian Behlendorf a0e625a878 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 15:41:52 -08:00
Brian Behlendorf 6b2c60acca Moving lib/libspl to linux-libspl branch 2008-12-11 15:38:59 -08:00
Brian Behlendorf 0b18a1c458 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-11 14:27:13 -08:00
Brian Behlendorf 01531d559d Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-11 14:27:03 -08:00
Brian Behlendorf 3bd537afcc Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-11 14:25:35 -08:00
Brian Behlendorf 503068ecec Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 14:25:32 -08:00
Brian Behlendorf a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf f3dd8353de Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-11 14:07:16 -08:00
Brian Behlendorf 33ee5a1dbe Resolve conflict 2008-12-11 14:06:30 -08:00
Brian Behlendorf 44ffa43709 Resolve conflict 2008-12-11 14:01:47 -08:00
Brian Behlendorf 98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf 3cd6b7e8e7 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-11 11:48:05 -08:00
Brian Behlendorf 50d862cf14 Resolve conflict 2008-12-11 11:47:40 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf b26c1b6ab0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 11:27:25 -08:00
Brian Behlendorf 4b7ee081ce Fix typo 2008-12-11 11:16:38 -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
Brian Behlendorf a769b2a110 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-10 12:56:24 -08:00
Brian Behlendorf 8978919d1b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-10 12:56:13 -08:00
Brian Behlendorf 2e0066c031 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-10 12:54:33 -08:00
Brian Behlendorf fbb34083f0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-10 12:46:18 -08:00
Brian Behlendorf 9e8b1e836c Remove libumem, we will try and remove this dependency entirely. If we can't then the best move will simply be to use the official library, or build it as a convenience library 2008-12-10 12:43:20 -08:00
Brian Behlendorf 9fbdeddd67 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-09 14:18:11 -08:00
Brian Behlendorf e66e190783 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-09 14:18:03 -08:00
Brian Behlendorf b569329a77 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-09 14:16:42 -08:00
Brian Behlendorf 19f58048cb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-09 14:16:39 -08:00
Brian Behlendorf 5e97ed8493 Move vmem* to libumem 2008-12-09 14:14:00 -08:00
Brian Behlendorf f1f6eb2199 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-09 13:43:53 -08:00
Brian Behlendorf 7af9bd9d90 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-09 13:43:27 -08:00
Brian Behlendorf a6be122d45 Resolve conflict 2008-12-09 13:41:28 -08:00
Brian Behlendorf cc5274f04e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-09 13:41:02 -08:00
Brian Behlendorf 48343be6a3 Temporarily move taskq+util to libzpool until that directory is broken in to lib+module 2008-12-09 13:32:01 -08:00
Brian Behlendorf e3c63d0c3c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-08 16:50:10 -08:00
Brian Behlendorf ee44b4a024 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-08 16:49:51 -08:00
Brian Behlendorf c9e7ffd777 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-08 16:47:04 -08:00
Brian Behlendorf acaaeda92a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-08 16:46:51 -08:00
Brian Behlendorf 2f40ac4d9e Minor tweak to update script 2008-12-08 16:38:46 -08:00
Brian Behlendorf fa554de5ee Add missing autogen.sh products 2008-12-08 10:04:13 -08:00
Brian Behlendorf c0b45720fc Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-05 14:23:06 -08:00
Brian Behlendorf 79689743c3 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-05 14:21:56 -08:00
Brian Behlendorf 18266508c7 Change libport+libsolcompat references to libspl 2008-12-05 14:20:33 -08:00
Brian Behlendorf 9ed7c9b6ad Refresh linux-zpios 2008-12-05 11:32:34 -08:00
Brian Behlendorf 9baaa468ac Refresh zfs-branch 2008-12-05 09:46:11 -08:00
Brian Behlendorf 96072c88e2 Add userspace zfs_context file 2008-12-03 15:43:56 -08:00
Brian Behlendorf b128c09fbe Rebase to OpenSolaris b103, in the process we are removing any code which did not originate from the OpenSolaris source. These changes will be reintroduced in topic branches for easier tracking 2008-12-03 12:09:06 -08:00
Brian Behlendorf 7ebbc0c799 Finish removing all non-upstream bits from master 2008-12-01 16:15:29 -08:00
Brian Behlendorf ef76e2f5ea Removed build system from master branch, will relocate to linux-zfs-branch 2008-12-01 15:41:33 -08:00
Brian Behlendorf 100eb88b46 Update zpios for trivial workload 2008-11-26 15:48:14 -08:00
Brian Behlendorf 34dc7c2f25 Initial Linux ZFS GIT Repo 2008-11-20 12:01:55 -08:00