Commit Graph

319 Commits

Author SHA1 Message Date
Brian Behlendorf 4bbb394a8a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 16:56:03 -08:00
Brian Behlendorf fdffe91056 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:55:59 -08:00
Brian Behlendorf 0844495710 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:55:58 -08:00
Brian Behlendorf f3d55cb4f5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 16:55:52 -08:00
Brian Behlendorf 30b961af2c Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 16:55:50 -08:00
Brian Behlendorf 3a76148338 Add a needed lib 2008-12-22 16:52:26 -08:00
Brian Behlendorf 9ef0280a5c Use pthread_ 2008-12-22 16:51:28 -08:00
Brian Behlendorf 683f0b1d6c Fix cast 2008-12-22 16:50:44 -08:00
Brian Behlendorf 626df0d909 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 16:43:41 -08:00
Brian Behlendorf 5f7f6a3934 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 16:43:07 -08:00
Brian Behlendorf 049d14bb79 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 16:40:39 -08:00
Brian Behlendorf 44f75e4f86 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:40:35 -08:00
Brian Behlendorf e8e738e3b9 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:40:34 -08:00
Brian Behlendorf f016a8e15f Update patch carried forward from old release 2008-12-22 16:35:36 -08:00
Brian Behlendorf dabf7f88f2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 16:34:20 -08:00
Brian Behlendorf 06d397baa9 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 16:33:38 -08:00
Brian Behlendorf 571618df63 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 16:30:48 -08:00
Brian Behlendorf 36c5ea8174 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:30:37 -08:00
Brian Behlendorf 43abce68c5 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:30:35 -08:00
Brian Behlendorf 8ab0586445 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 16:30:29 -08:00
Brian Behlendorf a6152094d0 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 16:30:27 -08:00
Brian Behlendorf dee065ca8d Use pthread versions 2008-12-22 16:26:23 -08:00
Brian Behlendorf 6a394806f5 Prototype fixes 2008-12-22 16:18:07 -08:00
Brian Behlendorf 6a45d1043b Refresh autogen products 2008-12-22 16:10:43 -08:00
Brian Behlendorf 7660bc4c74 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 16:09:49 -08:00
Brian Behlendorf ebfc1d4742 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 16:09:40 -08:00
Brian Behlendorf b269e2a4e8 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 16:09:36 -08:00
Brian Behlendorf de7c07cd9a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 16:09:01 -08:00
Brian Behlendorf 8ea2bead50 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 16:06:00 -08:00
Brian Behlendorf 419cff0fd3 Add more more missing headers 2008-12-22 16:02:08 -08:00
Brian Behlendorf 575903cb9a Comment out zfs_mount/umount 2008-12-22 16:01:04 -08:00
Brian Behlendorf 74006b778e Refresh autogen products 2008-12-22 15:54:05 -08:00
Brian Behlendorf 301cbbdf40 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 15:53:05 -08:00
Brian Behlendorf 96473c9eff Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 15:52:59 -08:00
Brian Behlendorf ea765bd3c0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 15:52:44 -08:00
Brian Behlendorf 7de608e8bb Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 15:51:17 -08:00
Brian Behlendorf d56b3c2440 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 15:51:14 -08:00
Brian Behlendorf 720f34ffbe Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 15:51:14 -08:00
Brian Behlendorf f58a0bf4ec Remove now unneeded verify 2008-12-22 15:49:13 -08:00
Brian Behlendorf 67a52f2701 Add more missing include paths 2008-12-22 15:48:05 -08:00
Brian Behlendorf 96a9ff084e Refresh autogen products 2008-12-22 15:38:30 -08:00
Brian Behlendorf f9baa3500d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 15:37:58 -08:00
Brian Behlendorf 332ec5e7c6 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 15:37:53 -08:00
Brian Behlendorf 81d3bae7ef Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 15:37:39 -08:00
Brian Behlendorf 42e1801037 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 15:36:18 -08:00
Brian Behlendorf 27dd5bca77 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 15:36:15 -08:00
Brian Behlendorf 1f19965f10 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 15:36:14 -08:00
Brian Behlendorf 262c2c49c1 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 15:36:13 -08:00
Brian Behlendorf 088c5451b7 Add missing include 2008-12-22 15:34:18 -08:00
Brian Behlendorf 9b3b373d4f Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99 2008-12-22 15:33:15 -08:00
Brian Behlendorf 02d41bf31e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:27:04 -08:00
Brian Behlendorf 1e9c6b3020 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:24:47 -08:00
Brian Behlendorf 79491b69f4 Start linux-have-zpl layer 2008-12-22 12:23:27 -08:00
Brian Behlendorf 08a400676b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:09:15 -08:00
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 4f1e40767b Refresh autogen products 2008-12-22 11:46:00 -08:00
Brian Behlendorf 397cdbf7f8 Fix typo 2008-12-22 11:43:14 -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 9a57b35c98 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 11:42:18 -08:00
Brian Behlendorf 7b4bf789e9 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:41:50 -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 7403ce6856 Add missing Makefile foo 2008-12-22 11:38:58 -08:00
Brian Behlendorf 8cc9fdcd1c Refresh autogen products 2008-12-22 11:31:34 -08:00
Brian Behlendorf 8a667a0028 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 11:31:02 -08:00
Brian Behlendorf b1a37a30a3 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 11:30:49 -08:00
Brian Behlendorf a97fc13639 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:30:21 -08:00
Brian Behlendorf 06ab7d120f Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:29:25 -08:00
Brian Behlendorf 6b1fc7b8ee Add linker flags 2008-12-22 11:27:30 -08:00
Brian Behlendorf 356e666729 Add linker flags 2008-12-22 11:26:16 -08:00
Brian Behlendorf 9fb38f075b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 11:25:39 -08:00
Brian Behlendorf 24a90ad2c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 11:25:38 -08:00
Brian Behlendorf 34d556babb Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 11:25:37 -08:00
Brian Behlendorf 7c89e6b7d5 Fix prototype 2008-12-22 11:25:28 -08:00
Brian Behlendorf 75abffec39 Refresh autogen products 2008-12-22 11:10:13 -08:00
Brian Behlendorf cd5f4d7e5d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 11:09:22 -08:00
Brian Behlendorf 1419a88378 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 11:09:07 -08:00
Brian Behlendorf aa52ed7d95 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:08:39 -08:00
Brian Behlendorf bf09a72b9a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:07:42 -08:00
Brian Behlendorf feb8953178 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 11:07:39 -08:00
Brian Behlendorf b8245db563 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 11:07:38 -08:00
Brian Behlendorf 03c0e92dfa Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 11:07:35 -08:00
Brian Behlendorf e18ac20f8c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 11:07:35 -08:00
Brian Behlendorf feb8aecd47 Fix prototype 2008-12-22 11:05:41 -08:00
Brian Behlendorf fdd6fa0727 We don't need to #undef verify here, this is handled better now with the verify cleanup 2008-12-22 11:02:23 -08:00
Brian Behlendorf 4bf318d0a8 Add needed libs 2008-12-22 11:00:47 -08:00
Brian Behlendorf b68bbdcf32 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 10:24:54 -08:00
Brian Behlendorf 00371ba18c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 10:24:41 -08:00
Brian Behlendorf 7debf8e578 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 10:24:13 -08:00
Brian Behlendorf 79e25a5194 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 10:23:18 -08:00
Brian Behlendorf a9e37c248d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 10:23:16 -08:00
Brian Behlendorf 342c4d05d6 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 10:23:15 -08:00
Brian Behlendorf 817ecade1a Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 10:23:14 -08:00
Brian Behlendorf 6da71c1404 Fix twop more missing voids in prototypes 2008-12-22 10:20:57 -08:00
Brian Behlendorf 31060d339c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 10:11:33 -08:00
Brian Behlendorf 8b0a74c863 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 10:11:31 -08:00
Brian Behlendorf c72d6b30e8 Remove one more header 2008-12-22 10:07:53 -08:00
Brian Behlendorf 8cee053327 Refresh autogen products 2008-12-22 09:28:14 -08:00
Brian Behlendorf e7d9beb361 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 09:27:41 -08:00
Brian Behlendorf ea48a9d80a Resolve conflict 2008-12-22 09:27:25 -08:00
Brian Behlendorf d52676f52b Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 09:26:35 -08:00
Brian Behlendorf b608990fea Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 09:25:52 -08:00
Brian Behlendorf ecf38d314e Resolve conflict 2008-12-22 09:25:04 -08:00
Brian Behlendorf b58e34e0d8 Update makefiles 2008-12-22 09:22:39 -08:00
Brian Behlendorf f583bf4e89 Refresh autogen products 2008-12-22 09:14:09 -08:00
Brian Behlendorf bca95f1cde Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 09:13:31 -08:00
Brian Behlendorf 70f4b7e8c2 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 09:13:18 -08:00
Brian Behlendorf 894c412b86 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 09:12:50 -08:00
Brian Behlendorf 7b9d830da2 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 09:12:06 -08:00
Brian Behlendorf e959b03a8e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 09:11:54 -08:00
Brian Behlendorf 98810ac9fb Update zpool Makefile 2008-12-22 09:10:00 -08:00
Brian Behlendorf cb859a27ba Add librt for clock_gettime 2008-12-22 09:06:24 -08:00
Brian Behlendorf 3b465d5229 Refresh autogen products 2008-12-19 17:05:29 -08:00
Brian Behlendorf 1b6e301a45 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 17:05:02 -08:00
Brian Behlendorf 329d309e24 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 17:04:33 -08:00
Brian Behlendorf d9965a52fe Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 17:03:38 -08:00
Brian Behlendorf 0a53a422b3 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 17:02:16 -08:00
Brian Behlendorf 35336f33ee Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 17:01:54 -08:00
Brian Behlendorf c8ad9946dc use zlib 2008-12-19 16:58:20 -08:00
Brian Behlendorf 3d2e368e7a Refresh autogen products 2008-12-19 16:12:00 -08:00
Brian Behlendorf c312cacdc2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-19 11:07:27 -08:00
Brian Behlendorf 01a745ee24 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-19 11:07:14 -08:00
Brian Behlendorf b2bf7106ed Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 11:06:46 -08:00
Brian Behlendorf 15268640a3 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-19 11:06:05 -08:00
Brian Behlendorf e461d277b9 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-19 11:05:52 -08:00
Brian Behlendorf cc92d6497b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf d67cf69e08 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-19 11:05:49 -08:00
Brian Behlendorf 893a49fa9a Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-19 11:05:48 -08:00
Brian Behlendorf 9041f66bad Fix all instances of for (int i;;) {} that were easily found 2008-12-19 11:03:54 -08:00
Brian Behlendorf 3da25300e3 Refresh autogen products 2008-12-18 14:02:22 -08:00
Brian Behlendorf 546961cdc0 Add autogen products 2008-12-17 16:24:56 -08:00
Brian Behlendorf 3f95673db0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 16:24:02 -08:00
Brian Behlendorf 7a650448ed Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-17 16:23:30 -08:00
Brian Behlendorf e253951a7d Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 16:22:34 -08:00
Brian Behlendorf eb5fa23261 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-17 16:21:07 -08:00
Brian Behlendorf 599e4757d3 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 16:20:40 -08:00
Brian Behlendorf 6481bdc3e7 Add -lm linker flag 2008-12-17 16:16:22 -08:00
Brian Behlendorf 35ee979e6c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 14:30:24 -08:00
Brian Behlendorf b0fbfcc592 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-17 14:30:22 -08:00
Brian Behlendorf 3b9d2f075b Fix non-void functions without return 2008-12-17 14:28:28 -08:00
Brian Behlendorf 25fdaadeb0 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 14:16:22 -08:00
Brian Behlendorf 8962d81857 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-17 14:16:19 -08:00
Brian Behlendorf 74999392aa Wrap share/mount with HAVE_ZPL 2008-12-17 14:05:47 -08:00
Brian Behlendorf 3ab12400a0 Refresh autogen products 2008-12-17 13:56:16 -08:00
Brian Behlendorf e3d7813b7d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-17 13:55:29 -08:00
Brian Behlendorf 10581d228d Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-17 13:55:06 -08:00
Brian Behlendorf 772de16021 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-17 13:54:18 -08:00
Brian Behlendorf b1534b904a Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-17 13:53:30 -08:00
Brian Behlendorf 9956c32d10 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-17 13:53:16 -08:00
Brian Behlendorf 1dfec71003 Add -pthreads 2008-12-17 13:51:11 -08:00