Commit Graph

894 Commits

Author SHA1 Message Date
Brian Behlendorf e77f9a10a9 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-02-18 15:20:53 -08:00
Brian Behlendorf e60db6f9dd Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-18 15:20:14 -08:00
Brian Behlendorf 830ac5b109 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 15:20:11 -08:00
Brian Behlendorf 6f8f3b5532 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 15:20:10 -08:00
Brian Behlendorf 9d4d22a26e Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 15:20:08 -08:00
Brian Behlendorf 8c228734a3 Fix cast 2009-02-18 15:15:56 -08:00
Brian Behlendorf 181fd4addc Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-02-18 14:37:16 -08:00
Brian Behlendorf a278e153c4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 14:35:20 -08:00
Brian Behlendorf 9f4865e4ca Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 14:34:45 -08:00
Brian Behlendorf f78c15d84f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-02-18 14:34:03 -08:00
Brian Behlendorf 8090a9a908 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -08:00
Brian Behlendorf 7872d84be6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 14:30:54 -08:00
Brian Behlendorf 15f5ddebdf Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
Conflicts:

	lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
Brian Behlendorf 6fe19bd252 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
2009-02-18 14:28:15 -08:00
Brian Behlendorf f0a8aedfbc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
2009-02-18 14:27:12 -08:00
Brian Behlendorf 5be9e325a1 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:

	module/zfs/arc.c
2009-02-18 14:03:22 -08:00
Brian Behlendorf ba528721da Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-02-18 13:12:58 -08:00
Brian Behlendorf 0b8e48b813 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-02-18 13:12:53 -08:00
Brian Behlendorf e203e7b48f Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-02-18 13:12:35 -08:00
Brian Behlendorf f686a87058 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/arc.c
2009-02-18 13:12:26 -08:00
Brian Behlendorf 3b17164f71 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/vdev.c
	module/zfs/zio.c
2009-02-18 13:09:32 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 27e7565a93 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-03 09:46:46 -08:00
Brian Behlendorf 3d86fad730 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-02-03 09:46:36 -08:00
Brian Behlendorf 9cd029b543 Remove mknod from library.
This is all nowhandled in the SPL.  When HAVE_GPL_ONLY_SYMBOLS is defined
because the module license is set to GPL we can leverage the udev interfaces
which will create the device.  When HAVE_GPL_ONLY_SYMBOLS is not defined
we resort to an ugly hack and the SPL invokes a usermode helper to create
to missing device file for us in /dev/.  Using GPL version modules is off
course preperable when possible.
2009-02-03 09:38:53 -08:00
Brian Behlendorf ca804c66f8 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-16 14:55:26 -08:00
Brian Behlendorf 7c5b7d2a94 This should always be success when zvol support is disabled 2009-01-16 14:52:35 -08:00
Brian Behlendorf 389b037e7a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-15 14:22:01 -08:00
Brian Behlendorf 476261f2d5 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 14:21:18 -08:00
Brian Behlendorf 2c83372734 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 14:21:11 -08:00
Brian Behlendorf 091a4a4ca4 Resolve conflict with removed cleaner type 2009-01-15 14:20:49 -08:00
Brian Behlendorf cb8e50168e Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-15 14:19:06 -08:00
Brian Behlendorf 1f372d9030 Resolve conflict with removed cleaner type 2009-01-15 14:18:01 -08:00
Brian Behlendorf ddaad20220 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:16:23 -08:00
Brian Behlendorf a42707fcc0 Resolve conflict with removed cleaner type 2009-01-15 14:16:03 -08:00
Brian Behlendorf 551838a6c8 Resolve conflict with removed cleaner type 2009-01-15 14:13:39 -08:00
Brian Behlendorf da7151a89e Resolve conflict with removed cleaner type 2009-01-15 14:11:19 -08:00
Brian Behlendorf 977fef2ba7 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-01-15 14:05:32 -08:00
Brian Behlendorf 2f36bf5af4 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-01-15 14:05:29 -08:00
Brian Behlendorf 35a269c06c Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-01-15 14:05:26 -08:00
Brian Behlendorf a2e601c6e3 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-15 14:04:39 -08:00
Brian Behlendorf 3fa768e21b Resolve conflict with removed cleaner type 2009-01-15 14:04:35 -08:00
Brian Behlendorf d3df6b2012 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-15 14:01:51 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf aff2252263 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-14 14:27:42 -08:00
Brian Behlendorf fd93449de9 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-14 14:27:31 -08:00
Brian Behlendorf 4fdb04d0a1 A little hackery to handle using zdb when the module stack isn't loaded. This is a hack and should be addressed upstream, zdb should not be attempting to initialize services it doesn't need 2009-01-14 14:25:25 -08:00
Brian Behlendorf e6746c2609 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-14 12:06:41 -08:00
Brian Behlendorf 3764ec0e1e Fixed sizeof() issue and minor cleanup 2009-01-14 12:03:03 -08:00
Brian Behlendorf 97073208f8 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-14 10:42:45 -08:00
Brian Behlendorf bdde0d9d40 Return success here not failure 2009-01-14 10:37:35 -08:00
Brian Behlendorf 7f9ce14e58 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-13 09:55:40 -08:00
Brian Behlendorf 09b6f64e2d Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-13 09:55:30 -08:00
Brian Behlendorf ef6d827a88 Don't check HAVE_SPL unavailable in userspace build 2009-01-13 09:53:35 -08:00
Brian Behlendorf a62a385848 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 16:54:15 -08:00
Brian Behlendorf 13ab1d30be Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 16:53:53 -08:00
Brian Behlendorf e22bfeab4e Update load/unload message, mknod /dev/zfs when udev is unavailable 2009-01-09 16:50:08 -08:00
Brian Behlendorf 402405558a Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 15:11:56 -08:00
Brian Behlendorf b8fc1110d1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-09 15:11:48 -08:00
Brian Behlendorf e86fa83ee6 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 15:11:16 -08:00
Brian Behlendorf 89cf8c8a67 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 15:11:11 -08:00
Brian Behlendorf aa6c4ff685 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 15:10:59 -08:00
Brian Behlendorf 921ebaf7f7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-09 15:10:43 -08:00
Brian Behlendorf 522fb18428 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 15:10:26 -08:00
Brian Behlendorf 6791a1ee34 I don't think we need this in userspace 2009-01-09 15:07:32 -08:00
Brian Behlendorf a7e5f34acb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 14:46:41 -08:00
Brian Behlendorf 7af644b8b3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-09 14:46:32 -08:00
Brian Behlendorf d584ad239d Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 14:46:01 -08:00
Brian Behlendorf 4022f85bac Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 14:45:56 -08:00
Brian Behlendorf be3a17e437 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 14:45:45 -08:00
Brian Behlendorf 8e1f5d7bec Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-09 14:45:29 -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 8a6f0ab272 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-08 10:29:23 -08:00
Brian Behlendorf eba9726539 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-08 10:29:13 -08:00
Brian Behlendorf e1a4af24af Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-08 10:28:37 -08:00
Brian Behlendorf a43e0b50fb Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-08 10:28:32 -08:00
Brian Behlendorf 06749d1581 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-08 10:28:18 -08:00
Brian Behlendorf c281c15c84 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-08 10:28:00 -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 77c4ef21ab Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 13:47:29 -08:00
Brian Behlendorf 889bb92210 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-05 13:47:21 -08:00
Brian Behlendorf dbcb8f3921 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 13:46:51 -08:00
Brian Behlendorf a9bfb78b5a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 13:46:47 -08:00
Brian Behlendorf 3bc01c0326 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 13:46:35 -08:00
Brian Behlendorf f88ab3c355 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-05 13:46:21 -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 35cfc1bb85 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 12:45:38 -08:00
Brian Behlendorf 0f742dfc96 Refresh context 2009-01-05 12:45:17 -08:00
Brian Behlendorf d5350109f4 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-05 12:40:55 -08:00
Brian Behlendorf 6ce317a8d5 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-05 12:40:48 -08:00
Brian Behlendorf 9c2bf69ecb Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-05 12:40:25 -08:00
Brian Behlendorf c8fa7c9b23 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-05 12:39:56 -08:00
Brian Behlendorf 9a0cb95b1b Resolve conflict 2009-01-05 12:38:23 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf ced77c2f1b Add unicode makefile references and support 2009-01-05 12:32:55 -08:00
Brian Behlendorf 1b327abcfd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-05 11:54:52 -08:00
Brian Behlendorf 3d2e086e21 Remove u8 support, moved to libu8 2009-01-05 11:52:51 -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 53f2b61ce1 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 15:21:10 -08:00
Brian Behlendorf 89585b82fa Add missing limits 2008-12-22 15:17:57 -08:00
Brian Behlendorf 3251158230 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 15:06:42 -08:00
Brian Behlendorf 091c16c185 Add missing tzfile.h 2008-12-22 15:04:47 -08:00
Brian Behlendorf 314e57ba29 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 14:59:06 -08:00
Brian Behlendorf b0704f1597 Add missing header for ztest 2008-12-22 14:57:15 -08:00
Brian Behlendorf 97e7199aaf Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 14:45:43 -08:00
Brian Behlendorf ef6c136edb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 14:45:33 -08:00
Brian Behlendorf 12573fb5b9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 14:44:59 -08:00
Brian Behlendorf c267d86b09 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 14:44:55 -08:00
Brian Behlendorf 16d3bec487 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 14:44:42 -08:00
Brian Behlendorf 997a274a13 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 14:44:25 -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 139792e6b2 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 13:53:03 -08:00
Brian Behlendorf fa078fa9dd Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 13:52:53 -08:00
Brian Behlendorf 262e367cd5 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 13:52:16 -08:00
Brian Behlendorf 877699acb1 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 13:52:11 -08:00
Brian Behlendorf 1f72057409 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 13:51:57 -08:00
Brian Behlendorf 52bfcda357 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 13:51:39 -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 0789abcd67 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2008-12-22 12:55:06 -08:00
Brian Behlendorf 57e03b4986 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 12:54:57 -08:00
Brian Behlendorf a40064cfd1 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 12:54:21 -08:00
Brian Behlendorf b7770e3b13 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 12:54:16 -08:00
Brian Behlendorf 34f30113a8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 12:54:03 -08:00
Brian Behlendorf 195c61d105 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 12:53:46 -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 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 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 d7fafdb56e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 11:42:23 -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 6d13a998fb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 11:41:45 -08:00
Brian Behlendorf 86392b70ad Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 11:41:40 -08:00
Brian Behlendorf 187be3051e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 11:41:27 -08:00
Brian Behlendorf 7f2da73568 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 11:41:11 -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 01dee27561 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:44 -08:00
Brian Behlendorf 4e564d755b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 10:37:42 -08:00
Brian Behlendorf 8ad9104988 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 10:37:10 -08:00
Brian Behlendorf 5169758856 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 10:37:05 -08:00
Brian Behlendorf c6e93310af Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 10:37:00 -08:00
Brian Behlendorf bdbd91fe46 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 10:36:48 -08:00
Brian Behlendorf 11147f632c Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 10:36:32 -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 5f0a629790 Add enable_extended_FILE_stdio #define 2008-12-22 10:34:22 -08:00
Brian Behlendorf 10911f9d71 Add missing sources 2008-12-22 10:27:41 -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 0ecac4865c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:03:22 -08:00
Brian Behlendorf e8b703cb46 Add sys/time.h 2008-12-22 10:00:01 -08:00
Brian Behlendorf 783faf9040 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:57:45 -08:00
Brian Behlendorf 6d9b733aab Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 16:57:43 -08:00
Brian Behlendorf 1a2361c2d7 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 16:56:39 -08:00
Brian Behlendorf 1963e197a7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 16:56:31 -08:00
Brian Behlendorf e8676f2c5f Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 16:56:24 -08:00
Brian Behlendorf 2e8b703fff Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:56:03 -08:00
Brian Behlendorf 96e85b9e96 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 16:55:34 -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 ae21fcad1c Add missing acl files 2008-12-19 16:49:31 -08:00
Brian Behlendorf 252ef2053c Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 16:36:02 -08:00
Brian Behlendorf 8806156f06 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 16:34:57 -08:00
Brian Behlendorf 6fdfd55847 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 16:34:48 -08:00
Brian Behlendorf 3f0c49cfa4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 16:34:38 -08:00
Brian Behlendorf cbc70456f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 16:34:10 -08:00
Brian Behlendorf 0868f08291 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 16:33:37 -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 6f718e396c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:27:08 -08:00
Brian Behlendorf 50c5923533 Resolve lingering atomic asm build issues. I think 2008-12-19 16:23:26 -08:00
Brian Behlendorf 449c6c9e8b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:11:13 -08:00
Brian Behlendorf 0581ade42b Add target_cpu 2008-12-19 16:07:26 -08:00
Brian Behlendorf 1974fe42c2 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 16:03:07 -08:00
Brian Behlendorf b66eafc892 Add assembler flags 2008-12-19 15:56:04 -08:00
Brian Behlendorf 23eb8e4234 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 15:13:32 -08:00
Brian Behlendorf febd743891 First pass at getting userspace 64bit atomic ops working: 2008-12-19 15:11:43 -08:00
Brian Behlendorf 8dbb32f117 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 13:58:44 -08:00
Brian Behlendorf 545f76d526 Add P2BOUNDARY macro 2008-12-19 13:56:55 -08:00
Brian Behlendorf d6013ca22b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-19 13:38:47 -08:00
Brian Behlendorf fbc711944c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-19 13:38:16 -08:00
Brian Behlendorf f4ff14afdb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-19 13:38:11 -08:00
Brian Behlendorf 0127d5e65b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-19 13:38:07 -08:00
Brian Behlendorf 4679c1631c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-19 13:37:55 -08:00
Brian Behlendorf 102a98af37 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-19 13:37:40 -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 b95f799218 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 13:16:48 -08:00
Brian Behlendorf 28edfc91c8 Add compress header 2008-12-19 13:14:49 -08:00
Brian Behlendorf 338dd65c10 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-19 12:40:02 -08:00