Commit Graph

191 Commits

Author SHA1 Message Date
Brian Behlendorf a6d6f31db6 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
Brian Behlendorf d7d260b870 Removing branch to readd under new name 2008-12-22 12:05:11 -08:00
Brian Behlendorf 42344f04c1 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:15:20 -08:00
Brian Behlendorf 8fdc6ee079 Stub out two more funcs until zpl support exists 2008-12-22 10:13:31 -08:00
Brian Behlendorf b07886e188 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-17 16:00:29 -08:00
Brian Behlendorf 9ab4c93028 Wrap more stuff in HAVE_ZPL 2008-12-17 15:58:20 -08:00
Brian Behlendorf 9877a35f9f Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-17 15:35:41 -08:00
Brian Behlendorf 06005641bb Stub out mount/share related func 2008-12-17 15:33:45 -08:00
Brian Behlendorf daa6dfed96 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 16:37:05 -08:00
Brian Behlendorf 4ece62233d Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 16:36:52 -08:00
Brian Behlendorf 8ffad5b6c0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 16:35:57 -08:00
Brian Behlendorf 715ac6ca88 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 16:34:16 -08:00
Brian Behlendorf 7453ec0f2c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:34:09 -08:00
Brian Behlendorf 8bed8da925 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:34:07 -08:00
Brian Behlendorf 2d7f255945 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 16:34:04 -08:00
Brian Behlendorf ebab24f633 Resolve shadow conflict 2008-12-16 16:26:50 -08:00
Brian Behlendorf 015fcbe3b2 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 16:21:32 -08:00
Brian Behlendorf 5477876bdb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 16:21:25 -08:00
Brian Behlendorf 94dd45c46d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 16:20:54 -08:00
Brian Behlendorf 6a902fe21c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 16:19:56 -08:00
Brian Behlendorf f2bc2f7b6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 16:19:52 -08:00
Brian Behlendorf fd4da48000 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 16:19:50 -08:00
Brian Behlendorf 29be0d44ba Resolve conflict 2008-12-16 16:19:46 -08:00
Brian Behlendorf 4d21a1c977 Resolve two more shadow conflicts 2008-12-16 16:14:19 -08:00
Brian Behlendorf 4ee4891d66 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 16:10:16 -08:00
Brian Behlendorf 862436f8c9 Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand 2008-12-16 16:06:24 -08:00
Brian Behlendorf 70c7936ebf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 15:52:15 -08:00
Brian Behlendorf bad9c6965c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 15:52:11 -08:00
Brian Behlendorf cc53801767 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 15:51:54 -08:00
Brian Behlendorf e5000a1073 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 15:51:22 -08:00
Brian Behlendorf 12c13fbafb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 15:51:20 -08:00
Brian Behlendorf 4583b6d5ba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf e14e140b52 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 15:51:19 -08:00
Brian Behlendorf 3c515284a6 Remove double declaration of char * 2008-12-16 15:49:21 -08:00
Brian Behlendorf f73c835830 Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it. 2008-12-16 15:44:02 -08:00
Brian Behlendorf 7e43e16395 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-16 15:34:50 -08:00
Brian Behlendorf 35f607040f Wrap additional new efi code in HAVE_LIBEFI macros 2008-12-16 15:33:00 -08:00
Brian Behlendorf ca161b928b Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 15:17:54 -08:00
Brian Behlendorf 36722eee12 Comment out most of the file until ZPL support arrives 2008-12-16 15:16:04 -08:00
Brian Behlendorf ef919ac403 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:45:31 -08:00
Brian Behlendorf 66587f0fee Remove all the share stuff 2008-12-16 14:43:38 -08:00
Brian Behlendorf e213f59844 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 14:34:51 -08:00
Brian Behlendorf b17ad01f98 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 14:34:47 -08:00
Brian Behlendorf a4c93e56cc Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 14:34:31 -08:00
Brian Behlendorf bb20fd94fc Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 14:34:17 -08:00
Brian Behlendorf 047a942f42 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 14:34:01 -08:00
Brian Behlendorf 79bc1b23ed Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf 804830a231 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 14:33:59 -08:00
Brian Behlendorf a8a0f9ea2a Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 14:33:58 -08:00
Brian Behlendorf 53c0cdbc42 Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname 2008-12-16 14:29:35 -08:00
Brian Behlendorf 554defd465 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-16 14:07:00 -08:00
Brian Behlendorf 12cb53ce52 Make SHARENFS condition with ZPL 2008-12-16 14:05:09 -08:00
Brian Behlendorf 33072dc1bc Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 13:31:13 -08:00
Brian Behlendorf 48b059e690 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 13:31:08 -08:00
Brian Behlendorf 751ee4041e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 13:30:53 -08:00
Brian Behlendorf 8342056a8a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 13:30:38 -08:00
Brian Behlendorf 1d4b1187d7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 13:30:23 -08:00
Brian Behlendorf 527e38c72b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf 34b937c016 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:30:21 -08:00
Brian Behlendorf f693a600d0 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:30:20 -08:00
Brian Behlendorf 206a3ac58c Resolve 2 more shadow conflicts 2008-12-16 13:28:23 -08:00
Brian Behlendorf c78fdcb14a Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 13:22:15 -08:00
Brian Behlendorf 2bfe519e8b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 13:22:11 -08:00
Brian Behlendorf d54cedd16c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 13:21:55 -08:00
Brian Behlendorf 1d4d3c5fa8 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 13:21:41 -08:00
Brian Behlendorf b22a5e18fe Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 13:21:25 -08:00
Brian Behlendorf 60ad9afc28 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf 5af8235e41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-16 13:21:23 -08:00
Brian Behlendorf f82621d7cb Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2008-12-16 13:19:26 -08:00
Brian Behlendorf 5383875500 Create gcc-shadow branch 2008-12-16 13:19:01 -08:00
Brian Behlendorf 01918870b4 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-16 10:16:00 -08:00
Brian Behlendorf e7d7f1803f Remove unused hunk 2008-12-16 10:14:08 -08:00
Brian Behlendorf 3112028a39 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-16 10:13:43 -08:00
Brian Behlendorf b62b556896 Moving unused hunk to unused patch 2008-12-16 10:11:41 -08:00
Brian Behlendorf 4f488ec6e4 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-16 09:06:01 -08:00
Brian Behlendorf 151ee60cbf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 09:05:02 -08:00
Brian Behlendorf e07281deb9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-16 09:04:47 -08:00
Brian Behlendorf ef55a13da8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-16 09:04:03 -08:00
Brian Behlendorf 589a6c72d6 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 09:03:27 -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 5fd645e47a Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-15 09:36:37 -08:00
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 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 faf6c753bd Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 15:07:33 -08:00
Brian Behlendorf f6421585ad Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 15:07:29 -08:00
Brian Behlendorf 54cb07032d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 15:07:12 -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 8917e616ba Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 15:06:57 -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 9787903adb Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:57:13 -08:00
Brian Behlendorf 06a700c073 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-12 14:57:08 -08:00
Brian Behlendorf f5a62035c7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-12 14:56:50 -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 d17d4bccd4 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 14:56:35 -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 a955848091 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 14:44:30 -08:00