Commit Graph

1530 Commits

Author SHA1 Message Date
Brian Behlendorf 81ec3f8951 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 16:43:53 -07:00
Brian Behlendorf bbe79ef2eb Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-10-09 16:43:13 -07:00
Brian Behlendorf 8b6b31f3e4 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-10-09 16:42:09 -07:00
Brian Behlendorf cb91bbe6ce Additional set of build system tweaks for libefi library. 2009-10-09 16:37:32 -07:00
Brian Behlendorf f0ac8537ff Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 16:23:16 -07:00
Brian Behlendorf cae4a99504 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-10-09 16:23:13 -07:00
Brian Behlendorf d7e242199c Header efi_partition.h moved to lib/libefi/include/sys/ 2009-10-09 16:18:39 -07:00
Brian Behlendorf 28cdfd90ef Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 16:13:31 -07:00
Brian Behlendorf caed68da36 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-10-09 16:13:11 -07:00
Brian Behlendorf fc2213dfac Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
Conflicts:

	lib/Makefile.am
2009-10-09 16:12:49 -07:00
Brian Behlendorf 7c073d0a7d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 16:09:54 -07:00
Brian Behlendorf f0e7c21dfc Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-10-09 16:09:14 -07:00
Brian Behlendorf a740d2a8f7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/Makefile.am
2009-10-09 16:06:51 -07:00
Brian Behlendorf a0337cfcd8 Add libefi library in to the build system. 2009-10-09 15:58:45 -07:00
Brian Behlendorf b04c6f54b9 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 15:46:16 -07:00
Brian Behlendorf c3b45fe669 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-10-09 15:45:55 -07:00
Brian Behlendorf 746882c100 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-10-09 15:45:38 -07:00
Brian Behlendorf 503c5eeb2d Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-10-09 15:45:22 -07:00
Brian Behlendorf 1e8929d87f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-10-09 15:44:42 -07:00
Brian Behlendorf 90b0761a16 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-10-09 15:43:37 -07:00
Brian Behlendorf e0e0f0ea84 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-10-09 15:43:33 -07:00
Brian Behlendorf 46fa16ed8c Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-10-09 15:43:28 -07:00
Brian Behlendorf 5fc177d934 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-10-09 15:43:00 -07:00
Brian Behlendorf 9302f90662 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-10-09 15:42:56 -07:00
Brian Behlendorf 926a2e3cc4 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2009-10-09 15:42:48 -07:00
Brian Behlendorf 3728b6d9c1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-10-09 15:42:16 -07:00
Brian Behlendorf 1b0e5a1485 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-10-09 15:42:15 -07:00
Brian Behlendorf 5c36312909 Script update-zfs.sh updated to include libefi library 2009-10-09 15:37:29 -07:00
Brian Behlendorf 0d8bb46b58 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 15:03:53 -07:00
Brian Behlendorf 6ef15db027 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-10-09 15:03:50 -07:00
Brian Behlendorf f73cff230f Reverting changes on linux-have-libefi topic branch. 2009-10-09 14:59:05 -07:00
Brian Behlendorf 92bb246ab4 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-18 14:22:55 -07:00
Brian Behlendorf 1365576b3e Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-18 14:22:24 -07:00
Brian Behlendorf 547471e842 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-18 14:22:00 -07:00
Brian Behlendorf 060284b353 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-18 14:21:35 -07:00
Brian Behlendorf bc611acf53 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-18 14:20:35 -07:00
Brian Behlendorf 87bdf80fb7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-18 14:19:13 -07:00
Brian Behlendorf 147adbe815 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-18 14:18:40 -07:00
Brian Behlendorf e4b55cfbff Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-18 14:18:36 -07:00
Brian Behlendorf 5d83878f46 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 14:18:34 -07:00
Brian Behlendorf e134b976b6 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-08-18 14:18:33 -07:00
Brian Behlendorf b29c1f87a0 Required build 121 updates for gcc-missing-braces 2009-08-18 14:08:46 -07:00
Brian Behlendorf ae556c9174 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-18 13:01:34 -07:00
Brian Behlendorf 6e43f5a80b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:

	module/zfs/rrwlock.c
	module/zfs/zfs_ioctl.c
2009-08-18 12:59:17 -07:00
Brian Behlendorf 3e17f18dcc Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-18 12:35:43 -07:00
Brian Behlendorf 8b02e1a43f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-18 12:35:12 -07:00
Brian Behlendorf b3561355b8 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-18 12:33:54 -07:00
Brian Behlendorf 2d067983d6 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-18 12:29:48 -07:00
Brian Behlendorf c67303e092 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/dsl_dataset.c
	module/zfs/rrwlock.c
	module/zfs/spa_history.c
	module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -07:00
Brian Behlendorf 50c623ccef Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-18 12:10:55 -07:00
Brian Behlendorf bfbac5daec Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-08-18 12:10:38 -07:00
Brian Behlendorf d205b25a74 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-08-18 12:09:10 -07:00
Brian Behlendorf b99b422796 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 12:08:58 -07:00
Brian Behlendorf 41b297a27f Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2009-08-18 12:08:46 -07:00
Brian Behlendorf abd8fdb94f Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:

	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
2009-08-18 12:08:36 -07:00
Brian Behlendorf e5e4fadc34 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/dmu.c
	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
	module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
Brian Behlendorf 0f80e41c89 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/spa_misc.c
	module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
Brian Behlendorf 45d1cae3b8 Rebase master to b121 2009-08-18 11:43:27 -07:00
Brian Behlendorf 1f8a43f7a2 Refresh autogen products 2009-08-17 21:58:33 -07:00
Brian Behlendorf 5ad5798f92 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-04 15:59:15 -07:00
Brian Behlendorf 0803564cbe Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-04 15:58:39 -07:00
Brian Behlendorf 1dd0a6bab1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-04 15:58:13 -07:00
Brian Behlendorf 4eae170dc5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-04 15:57:44 -07:00
Brian Behlendorf 1bfe0d5177 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-04 15:56:36 -07:00
Brian Behlendorf e86a0e8ad1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-04 15:55:06 -07:00
Brian Behlendorf 72fc3eca7e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-04 15:54:25 -07:00
Brian Behlendorf f88cbd6535 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-04 15:54:21 -07:00
Brian Behlendorf 8c28ed9bff Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-08-04 15:54:19 -07:00
Brian Behlendorf 7069d048a0 Revert kthreads based on pthread thread specific data due to failure.
With this patch applied I get the following failure 100% of the time,
I'd prefer to debug it and keep moving forward but I do not have the
time right now so I'm reverting the patch to the version which worked.
Ricardo please fix.

(gdb) bt
0  ztest_dmu_write_parallel (za=0x2aaaac898960) at
../../cmd/ztest/ztest.c:2566
1  0x0000000000405a79 in ztest_thread (arg=<value optimized out>)
    at ../../cmd/ztest/ztest.c:3862
2  0x00002b2e6a7a841d in zk_thread_helper (arg=<value optimized out>)
    at ../../lib/libzpool/kernel.c:131
3  0x000000379be06367 in start_thread (arg=<value optimized out>)
    at pthread_create.c:297
4  0x000000379b2d30ad in clone () from /lib64/libc.so.6
2009-08-04 15:42:24 -07:00
Brian Behlendorf 3d8212e5de Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-04 14:44:03 -07:00
Brian Behlendorf ca59cc5c82 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-04 14:43:29 -07:00
Brian Behlendorf 5cc3f79553 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-04 14:43:02 -07:00
Brian Behlendorf 94fd6b5326 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-04 14:42:33 -07:00
Brian Behlendorf d160703a9c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-04 14:41:26 -07:00
Brian Behlendorf 4576ca6889 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-04 14:39:53 -07:00
Brian Behlendorf 139ca4655e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-04 14:39:11 -07:00
Brian Behlendorf 3e5388907b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-04 14:39:07 -07:00
Brian Behlendorf 9aedfd95f6 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-08-04 14:39:06 -07:00
Ricardo M. Correia c0ce3b40f2 Reimplement user kthreads based on pthread thread specific data.
This resolves previous scalabily concerns about the cost of calling
curthread which previously required a list walk.  The kthread address
is now tracked as thread specific data which can be quickly returned.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-08-04 13:55:15 -07:00
Brian Behlendorf 298cd19823 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-31 14:06:56 -07:00
Brian Behlendorf 9dec42d15d Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-31 14:06:28 -07:00
Brian Behlendorf 0c20001d27 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-31 14:06:05 -07:00
Brian Behlendorf 21dee98331 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-31 14:05:42 -07:00
Brian Behlendorf e03d56f19c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-31 14:04:46 -07:00
Brian Behlendorf 744f29654f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-31 14:03:32 -07:00
Brian Behlendorf 4880532956 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-31 14:02:54 -07:00
Brian Behlendorf 9f5e45ef4d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-31 14:02:49 -07:00
Brian Behlendorf cf44f97b96 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-31 14:02:48 -07:00
Brian Behlendorf 252846a145 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-07-31 14:02:46 -07:00
Brian Behlendorf cfd9e9936f Fix an accidentally introduced formatting issue in zfs output.
Because the local 'index' variable shadows the index() function
it was replaced by 'i'.  Unfortunately when I made this change
I accidentally replaced one instance with 'j' resulting in the
short decimal values being printed incorrectly.
2009-07-31 13:50:21 -07:00
Brian Behlendorf b50f09fa80 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-29 21:31:59 -07:00
Brian Behlendorf dbee607bbd Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-29 21:31:26 -07:00
Brian Behlendorf d6bde0ec4f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-29 21:31:02 -07:00
Brian Behlendorf 54f3881f7a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-29 21:30:36 -07:00
Brian Behlendorf 9cdb618921 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-29 21:29:28 -07:00
Brian Behlendorf d29bbc0642 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-29 21:28:05 -07:00
Brian Behlendorf 640e02d051 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-29 21:27:17 -07:00
Brian Behlendorf 2d86fb2788 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-29 21:27:13 -07:00
Brian Behlendorf e2bbeb5e61 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-29 21:27:06 -07:00
Brian Behlendorf f80c505f4d Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-07-29 21:27:04 -07:00
Brian Behlendorf 72d2035ed3 Updated gcc in fc11 flagged a new uninitialized variable. 2009-07-29 21:17:47 -07:00
Brian Behlendorf 535dab57d2 Refresh autogen products. 2009-07-29 17:54:49 -07:00
Brian Behlendorf 40cad03c51 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-24 11:18:03 -07:00
Brian Behlendorf 484b3af49f Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-24 11:17:33 -07:00
Brian Behlendorf f86aa17c6c Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-24 11:17:09 -07:00
Brian Behlendorf 278a36455f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-24 11:15:55 -07:00
Brian Behlendorf a9ffd4b53b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-24 11:14:53 -07:00
Brian Behlendorf 937dfea552 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-24 11:13:42 -07:00
Brian Behlendorf 430d6004e5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	scripts/Makefile.am
2009-07-24 11:10:21 -07:00
Brian Behlendorf db3967ba86 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-24 11:08:43 -07:00
Brian Behlendorf 9a2275c1c5 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-24 11:08:42 -07:00
Ricardo M. Correia 51760e3c7e Change VERIFY() into VERIFY3U() when creating threads in ztest, so that we can see the return code when it fails.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-07-24 11:00:23 -07:00
Brian Behlendorf dba29a5097 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-24 09:20:01 -07:00
Brian Behlendorf cbb3788214 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-24 09:19:34 -07:00
Brian Behlendorf a65ba1acc5 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-24 09:19:12 -07:00
Brian Behlendorf 8f1db6316f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-24 09:18:50 -07:00
Brian Behlendorf 9b7658ca98 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-24 09:17:54 -07:00
Brian Behlendorf fe9f4bdd27 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-24 09:16:41 -07:00
Brian Behlendorf 4edfcf44ec Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-24 09:15:59 -07:00
Brian Behlendorf 82ca18caae Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-24 09:15:56 -07:00
Brian Behlendorf 825c086a4e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-07-24 09:15:55 -07:00
Brian Behlendorf e4610d7991 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-07-24 09:15:53 -07:00
Brian Behlendorf 1b4dfb80fb Increase buffer size for nvlist for large configurations
It's still not clear to me why the default value here is large
enough Solaris.  I hit this limit again when setting up 120 SATA
drives configured as 15 raidz2 groups each containing 8 drives.
We expect to go bigger so we may just want to spend a little
time and figure out how to make this all dynamic.
2009-07-24 08:53:18 -07:00
Brian Behlendorf 05e40ce941 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-20 13:26:07 -07:00
Brian Behlendorf b3dab369eb Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-20 13:26:05 -07:00
Brian Behlendorf 2b1eaf77d4 Remove zfs_debug.h which is a duplicate of the version in the
modules directory.  Having two copies is just asking for trouble.
2009-07-20 13:18:24 -07:00
Brian Behlendorf 4fe5e3cdb9 Refresh autogen products 2009-07-17 09:47:44 -07:00
Brian Behlendorf 61fe8995d8 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-17 09:46:25 -07:00
Brian Behlendorf 65e81abfed Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-17 09:46:23 -07:00
Brian Behlendorf 3a63d17619 Add option -fPIC (Position Independent Code) needed for x86_64.
While the generic atomic implementation is not used by default
for x86_64 or x86 builds, we still need to always build it with
-fPIC if we ever want to use it on these platforms.
2009-07-17 09:36:01 -07:00
Brian Behlendorf 896b3a3194 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-16 13:46:18 -07:00
Brian Behlendorf 35e7382fd2 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-16 13:46:15 -07:00
Brian Behlendorf 18b7a966e4 Minor build fixes from asm-generic change.
- Drop _NOTE(CONSTCOND) usage in libspl this is Solaris specific.
- Resolve conflicting OR and AND long prototypes.
2009-07-16 13:37:59 -07:00
Brian Behlendorf 8feebe7d65 Refresh autogen products 2009-07-16 10:29:59 -07:00
Brian Behlendorf ccd59502da Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-16 10:28:22 -07:00
Brian Behlendorf ac81bc8094 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-16 10:28:14 -07:00
Brian Behlendorf 3ae0e369f3 Add generic user space atomic support.
Futher testing on my powerpc system revealed that the powerpc
specific atomic implemetation was flawed.  Rather than spending
a lot of time correctly reimplementing it in assembly I have
reworked it in to a 100% generic version.  The generic version
will not perform well but it does provide correct sematics.  It
will be used only when there is no architecture specific version
available.  These changes do not impact x86_64 and x86 which have
have correct native implementations.
2009-07-16 09:59:44 -07:00
Brian Behlendorf 3f64208b78 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-14 16:56:48 -07:00
Brian Behlendorf f7ea79b354 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-14 16:56:00 -07:00
Brian Behlendorf 1c396c4600 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-14 16:55:21 -07:00
Brian Behlendorf 46ffc6bfd1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-14 16:54:39 -07:00
Brian Behlendorf c22614ed12 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-14 16:52:59 -07:00
Brian Behlendorf 56045106bd Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-14 16:50:54 -07:00
Brian Behlendorf 5b0851cbdb Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-14 16:49:36 -07:00
Brian Behlendorf 5753d78dcd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-14 16:49:29 -07:00
Brian Behlendorf e9d7526fb3 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-14 16:49:27 -07:00
Brian Behlendorf a13cdecdd2 Remove debug printf 2009-07-14 16:35:13 -07:00
Brian Behlendorf 3f75bcab7a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-07-14 15:38:53 -07:00
Brian Behlendorf 5a3e63ff19 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-14 15:38:46 -07:00
Ricardo M. Correia 4279777f47 Fixed the zpool and zfs commands returning 'internal error: Out of memory.' due to a failure in nvlist_common().
The failure turned out to be missing macro definitions for little
endian and big endian.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-07-14 15:31:03 -07:00