Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
19,503 Commits 42 Branches 132 Tags 226 MiB
Commit Graph

894 Commits

Author SHA1 Message Date
Brian Behlendorf 999f693b85 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-09 12:23:46 -07:00
Brian Behlendorf c4c4afd8fd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 12:23:41 -07:00
Brian Behlendorf 6db8882b78 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 12:23:39 -07:00
Brian Behlendorf 76bf02aebb Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-09 12:23:36 -07:00
Brian Behlendorf f1d99c0653 Revert to original debugging code and wrap any variabled used only 
within an ASSERT with the ASSERTV macro which will ensure it will
be removed when the ASSERTs are commented out.  This makes gcc much
happier, makes the variables usage explicit, and removes the need
for the compiler to detect it is unused and do the right thing.
 2009-07-09 12:10:52 -07:00
Brian Behlendorf 88acc774ac Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-08 16:12:52 -07:00
Brian Behlendorf 29bc1b0729 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-08 16:12:39 -07:00
Brian Behlendorf f0fb421934 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-08 16:11:58 -07:00
Brian Behlendorf 92d51724d5 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-08 16:11:44 -07:00
Brian Behlendorf 664f17e68b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 16:09:59 -07:00
Brian Behlendorf b2d5b42a02 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-08 16:09:07 -07:00
Brian Behlendorf 4f8cdd006b Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-08 16:08:53 -07:00
Brian Behlendorf 963603808d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-08 16:08:18 -07:00
Brian Behlendorf 8070ba7bea Untracked pthread changes which must have accidentally crept in. 
This is exactly the reason why I want a new topgit command which
takes the base, then incrementally applies all the patches and
compares them againsts what is actually committed.  This would
ensure this sort of thing doesn't happen!
 2009-07-08 15:58:28 -07:00
Brian Behlendorf 2ddc86747d Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-08 15:05:32 -07:00
Brian Behlendorf 20635eaf51 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-08 15:05:19 -07:00
Brian Behlendorf 5cbd98db73 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-08 15:04:37 -07:00
Brian Behlendorf 133f5a2bdd Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-08 15:04:23 -07:00
Brian Behlendorf d95ee13c20 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 15:02:31 -07:00
Brian Behlendorf 28dcf07ed5 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-08 15:01:40 -07:00
Brian Behlendorf 9d0a9d87d6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-08 15:01:26 -07:00
Brian Behlendorf c821af8f89 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-08 15:00:48 -07:00
Brian Behlendorf 058a25a017 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 15:00:43 -07:00
Brian Behlendorf 275d66171b Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-08 15:00:41 -07:00
Brian Behlendorf 57ae3b59e9 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-07-08 15:00:39 -07:00
Brian Behlendorf 2caba8e240 Add new DMU_READ_PREFETCH flag to dmu_read(). 2009-07-08 14:51:55 -07:00
Brian Behlendorf 1ab1b8502b Stop the kthread/thread/pthread mixing and matching insanity. Update all 
code to only use the kthread API regardless of if it is compiled in the
kernel or user space.  The kthread API will be layered on top of pthreads
as best as possible in zfs_context, this is non optimal but much clearer.
 2009-07-08 14:47:23 -07:00
Brian Behlendorf b5c5838d48 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-08 09:20:50 -07:00
Brian Behlendorf b12e8eb702 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-08 09:20:37 -07:00
Brian Behlendorf cfa46b4440 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-08 09:19:57 -07:00
Brian Behlendorf 78b1d31076 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-08 09:19:44 -07:00
Brian Behlendorf 1355255010 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 09:17:52 -07:00
Brian Behlendorf cca71cc88b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-08 09:17:00 -07:00
Brian Behlendorf 1182c9a9d1 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-08 09:16:47 -07:00
Brian Behlendorf affa4ec536 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-08 09:16:10 -07:00
Brian Behlendorf 33077ad631 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 09:16:05 -07:00
Brian Behlendorf f00e6fe5c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-08 09:16:04 -07:00
Brian Behlendorf 23cff295e2 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-07-08 09:16:02 -07:00
Brian Behlendorf 5fc46112cb Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-08 09:16:01 -07:00
Brian Behlendorf b2e459dab0 Add explicit casts for (u_longlong_t) when printing uint64_t. 2009-07-08 09:07:13 -07:00
Brian Behlendorf 5534447477 Add explicit casts for (u_longlong_t) when printing uint64_t. 2009-07-08 09:06:03 -07:00
Brian Behlendorf b2dcbdf490 Resolve a 2 new cases of for loop variable declared in for() 2009-07-08 09:04:21 -07:00
Brian Behlendorf 20989cd4f2 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-06 17:01:43 -07:00
Brian Behlendorf 621679fec6 Update to use dmu_read() instead of dmu_read_impl() now that a 'flags' 
argument is available.  This flags argument was added to allow a clean
API for disabling prefetch, so I'll update zpios to use it in preference
to the module option hack used before.
 2009-07-06 16:51:59 -07:00
Brian Behlendorf 06a30ede64 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-06 15:42:35 -07:00
Brian Behlendorf 53247399a0 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-06 15:42:24 -07:00
Brian Behlendorf 684a4c5f30 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-06 15:41:50 -07:00
Brian Behlendorf f90e398526 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-06 15:41:37 -07:00
Brian Behlendorf ba95b1816a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-06 15:40:13 -07:00
Brian Behlendorf d895de5ecb Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-06 15:39:35 -07:00
Brian Behlendorf 093f510c09 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-06 15:39:24 -07:00
Brian Behlendorf acd330cad6 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-06 15:38:55 -07:00
Brian Behlendorf 69b2257940 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-06 15:38:51 -07:00
Brian Behlendorf 8463b9e01e Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-06 15:38:50 -07:00
Brian Behlendorf 3a8e684d73 Additional lock calls were added to ztest and they must be updated 
to use the pthread's API in favour of Solaris threads.
 2009-07-06 15:31:54 -07:00
Brian Behlendorf e61876b24c Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 
Conflicts:

	cmd/ztest/ztest.c
 2009-07-06 15:21:07 -07:00
Brian Behlendorf a6b1465e30 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 
Conflicts:

	module/zfs/include/sys/zfs_fuid.h
	module/zfs/zfs_fuid.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_vfsops.c
	module/zfs/zfs_znode.c
 2009-07-06 15:16:54 -07:00
Brian Behlendorf d65102b493 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-06 15:08:57 -07:00
Brian Behlendorf 409cfe5051 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 
Conflicts:

	lib/libzfs/libzfs_pool.c
 2009-07-06 15:05:47 -07:00
Brian Behlendorf 266a7d8cd7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 
Conflicts:

	module/zcommon/zfs_namecheck.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
 2009-07-06 13:47:04 -07:00
Brian Behlendorf 053043b2d0 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 
Conflicts:

	lib/libzfs/libzfs_pool.c
 2009-07-06 13:44:19 -07:00
Brian Behlendorf a33c6c25d2 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-06 13:43:22 -07:00
Brian Behlendorf 149c4b2731 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:

	cmd/ztest/ztest.c
	lib/libzfs/libzfs_pool.c
	module/zcommon/zfs_namecheck.c
	module/zfs/dmu.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
	module/zfs/zfs_fuid.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_vfsops.c
	module/zfs/zfs_znode.c
 2009-07-06 13:40:29 -07:00
Brian Behlendorf 658459249e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-06 13:17:28 -07:00
Brian Behlendorf 926b04acba Merge branch 'feature-branch' into refs/top-bases/zfs-branch 
Conflicts:

	cmd/ztest/ztest.c
 2009-07-06 13:17:16 -07:00
Brian Behlendorf cd098f87c8 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 
Conflicts:

	cmd/ztest/ztest.c
 2009-07-06 13:16:29 -07:00
Brian Behlendorf 8795d8f034 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2009-07-06 13:15:43 -07:00
Brian Behlendorf 95ba24ed69 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 
Conflicts:

	cmd/ztest/ztest.c
 2009-07-06 13:15:35 -07:00
Brian Behlendorf 01c3cfc58f Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 
Conflicts:

	module/zfs/zil.c
 2009-07-06 13:12:23 -07:00
Brian Behlendorf a1ccb00b7e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 
Conflicts:

	cmd/ztest/ztest.c
	module/zfs/zil.c
 2009-07-06 13:11:34 -07:00
Brian Behlendorf dbaf4f6c0f Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source 
Conflicts:

	cmd/ztest/ztest.c
 2009-07-02 17:08:30 -07:00
Brian Behlendorf 480b03791d Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 
Conflicts:

	lib/libzfs/libzfs_dataset.c
 2009-07-02 17:07:52 -07:00
Brian Behlendorf 44703f0029 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/arc.c
	module/zfs/spa.c
 2009-07-02 16:57:09 -07:00
Brian Behlendorf a5a71d128d Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/spa.c
 2009-07-02 16:52:07 -07:00
Brian Behlendorf 5a2a5d64a5 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-07-02 16:51:09 -07:00
Brian Behlendorf b095bf444a Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 
Conflicts:

	cmd/zfs/zfs_main.c
	lib/libzfs/libzfs_dataset.c
 2009-07-02 16:50:53 -07:00
Brian Behlendorf e2b2597751 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 
Conflicts:

	cmd/zdb/zdb_il.c
	cmd/zfs/zfs_main.c
	cmd/zinject/zinject.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_graph.c
	module/zcommon/include/sys/fm/fs/zfs.h
	module/zcommon/include/zfs_deleg.h
	module/zcommon/include/zfs_namecheck.h
	module/zcommon/zfs_deleg.c
	module/zcommon/zfs_namecheck.c
	module/zcommon/zprop_common.c
	module/zfs/arc.c
	module/zfs/dmu.c
	module/zfs/dmu_object.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_pool.c
	module/zfs/dsl_prop.c
	module/zfs/fletcher.c
	module/zfs/include/sys/dsl_deleg.h
	module/zfs/include/sys/dsl_prop.h
	module/zfs/include/sys/metaslab_impl.h
	module/zfs/include/sys/spa_boot.h
	module/zfs/include/sys/zap.h
	module/zfs/include/sys/zap_impl.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ctldir.h
	module/zfs/include/sys/zfs_dir.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/spa.c
	module/zfs/spa_errlog.c
	module/zfs/spa_history.c
	module/zfs/zap.c
	module/zfs/zap_leaf.c
	module/zfs/zap_micro.c
	module/zfs/zfs_ioctl.c
	module/zfs/zio.c
 2009-07-02 16:49:11 -07:00
Brian Behlendorf e9f14862a5 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 
Conflicts:

	module/zfs/dmu_objset.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/vdev_label.c
	module/zfs/zio.c
 2009-07-02 16:18:03 -07:00
Brian Behlendorf 9babb37438 Rebase master to b117 2009-07-02 15:44:48 -07:00
Brian Behlendorf 9f4fdec42d Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-05-22 16:38:49 -07:00
Brian Behlendorf 2a744e0bbb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-05-22 16:38:43 -07:00
Brian Behlendorf 2384f8a72f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-05-22 16:38:21 -07:00
Brian Behlendorf 4e048c65aa Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-05-22 16:38:14 -07:00
Brian Behlendorf 40e75795ca Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-05-22 16:37:19 -07:00
Brian Behlendorf 4a2266c1d5 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-05-22 16:36:53 -07:00
Brian Behlendorf 300575508d Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-05-22 16:36:45 -07:00
Brian Behlendorf 5451ee79e5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-05-22 16:36:26 -07:00
Brian Behlendorf e1d6e67473 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-05-22 16:36:23 -07:00
Brian Behlendorf 9c53917bd5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-05-22 16:36:23 -07:00
Brian Behlendorf e56aa929e8 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-05-22 16:36:22 -07:00
Brian Behlendorf 8e9605062a Explictly use signed char for portability. On x86/x86_64 
systems the default char type is signed, on ppc/ppc64 systems
the default char type is unsigned.
 2009-05-22 16:30:47 -07:00
Brian Behlendorf 17a6ec3550 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-20 09:33:52 -07:00
Brian Behlendorf d24362e80b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-20 09:33:38 -07:00
Brian Behlendorf fa58082158 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-20 09:33:01 -07:00
Brian Behlendorf 0826ebc008 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-20 09:32:50 -07:00
Brian Behlendorf dddcb5433e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-20 09:31:02 -07:00
Brian Behlendorf dd585763ef Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-20 09:30:16 -07:00
Brian Behlendorf daab277117 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-20 09:30:03 -07:00
Brian Behlendorf 1b2503a433 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-20 09:29:26 -07:00
Brian Behlendorf f53e5a851d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-20 09:29:22 -07:00
Brian Behlendorf 0c88bc3ccd Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-03-20 09:29:21 -07:00
Brian Behlendorf 13814fe220 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-03-20 09:29:16 -07:00
Brian Behlendorf 99da5f93e8 Fix uninitialized variable error in ztest_dmu_commit_callbacks() 2009-03-20 09:20:49 -07:00
Brian Behlendorf 69d994bbe9 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-19 21:32:36 -07:00
Brian Behlendorf f764039e87 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 21:32:26 -07:00
Brian Behlendorf aee87a5ab6 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-19 21:31:54 -07:00
Brian Behlendorf 6756c613c1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 21:31:38 -07:00
Brian Behlendorf 61914d7403 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-19 21:30:15 -07:00
Brian Behlendorf ea8c53f9e1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-19 21:29:37 -07:00
Brian Behlendorf 1b88587905 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-19 21:29:26 -07:00
Brian Behlendorf 56d18263ed Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-19 21:28:54 -07:00
Brian Behlendorf bd1685ee4e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 21:28:51 -07:00
Brian Behlendorf 1769e10f17 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-03-19 21:28:50 -07:00
Brian Behlendorf 63781842e3 Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks. 2009-03-19 21:21:35 -07:00
Brian Behlendorf 9ab7adb553 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-19 21:13:22 -07:00
Brian Behlendorf 4f2dfa3c94 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 21:13:11 -07:00
Brian Behlendorf 665c272091 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-19 21:11:35 -07:00
Brian Behlendorf a676a29d25 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 21:11:25 -07:00
Brian Behlendorf 275f4aae5d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 
Conflicts:

	module/zfs/dmu_tx.c
 2009-03-19 21:08:17 -07:00
Brian Behlendorf 0bdc8e0aec Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-19 21:06:46 -07:00
Brian Behlendorf 376a68e404 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-19 21:06:35 -07:00
Brian Behlendorf 7f33364d3c Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
	module/zfs/dmu_tx.c
	module/zfs/txg.c
 2009-03-19 21:03:58 -07:00
Brian Behlendorf e7f02d3b41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 20:59:33 -07:00
Brian Behlendorf eb811f7fa9 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 
Conflicts:

	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/txg.h
 2009-03-19 20:59:12 -07:00
Brian Behlendorf 54b5b41a58 Add 'feature-pthreads' branch to features branch. 2009-03-19 20:49:52 -07:00
Brian Behlendorf 29703a5b4e Add 'feature-commit-cb' branch for DMU commit callbacks. 2009-03-19 20:30:14 -07:00
Brian Behlendorf 82c7af8987 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-19 19:58:40 -07:00
Brian Behlendorf 7a87dfebb8 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 19:58:30 -07:00
Brian Behlendorf d9fd92c850 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-19 19:57:26 -07:00
Brian Behlendorf 240445807b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 19:57:13 -07:00
Brian Behlendorf dabea57f25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-19 19:55:49 -07:00
Brian Behlendorf bd2293fdb1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-19 19:55:03 -07:00
Brian Behlendorf 1d2e8df03f Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-19 19:54:53 -07:00
Brian Behlendorf 5e5d31f105 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
 2009-03-19 19:52:21 -07:00
Brian Behlendorf 8c43ad3853 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 19:49:56 -07:00
Brian Behlendorf 8cdcf1ef44 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-19 19:49:55 -07:00
Brian Behlendorf 05cec154f5 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-03-19 19:49:53 -07:00
Brian Behlendorf 53db4c7b29 Revert fix-pthreads moving to feature-pthreads branch 2009-03-19 19:43:09 -07:00
Brian Behlendorf f66b3676e1 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-18 14:40:20 -07:00
Brian Behlendorf 1eb357eeb1 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-18 14:40:02 -07:00
Brian Behlendorf b46037b53f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-18 14:39:07 -07:00
Brian Behlendorf c7cc10351e Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-18 14:38:48 -07:00
Brian Behlendorf 5b5d766544 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-18 14:34:25 -07:00
Brian Behlendorf 3f05b34895 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-18 14:33:06 -07:00
Brian Behlendorf c0a760420e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-18 14:32:47 -07:00
Brian Behlendorf c6ddce0341 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-18 14:31:53 -07:00
Brian Behlendorf 70407622a7 Move `make check` ztest under ./scripts where the module stack is loaded. 2009-03-18 14:19:04 -07:00
Brian Behlendorf 6ca96b06b4 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-18 13:03:00 -07:00
Brian Behlendorf cc4fbf2c35 Revert to previous behavior zdb fails when unable to open /dev/zfs. 
For the moment I have added an error message to the failure path to
make it clear what happened.  I have also changed the zdb ASSERT to
a VERIFY so we always catch the failure.  For now we will just always
ensure the module stack is loaded, longer term we need something a
little more flexible.
 2009-03-18 12:48:54 -07:00
Brian Behlendorf af0afd9ce3 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-16 11:24:10 -07:00
Brian Behlendorf 53edd221ff Pull unused get_one_dataset() under HAVE_ZPL ifdef. 2009-03-16 11:14:19 -07:00
Brian Behlendorf a4f629ec9d Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-16 10:43:34 -07:00
Brian Behlendorf cddaf29902 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-16 10:43:19 -07:00
Brian Behlendorf 754431f4db Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-16 10:42:43 -07:00
Brian Behlendorf 10e245f03f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 
Conflicts:
	cmd/zpool/zpool_main.c
 2009-03-16 10:42:20 -07:00
Brian Behlendorf e98228ab73 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-16 10:39:08 -07:00
Brian Behlendorf dbbb5c2e4e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-16 10:38:52 -07:00
Brian Behlendorf c9cff73d9e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:
	cmd/zpool/zpool_main.c
 2009-03-16 10:32:12 -07:00
Brian Behlendorf be112b3f57 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-16 10:30:31 -07:00
Brian Behlendorf 5ee8a85ba6 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-16 10:30:27 -07:00
Brian Behlendorf 9818e69640 Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2009-03-16 10:12:01 -07:00
Brian Behlendorf 2924858552 Remove two self referential functions. 
Newer versions of gcc (4.3.0) detected the following unused
code segments.
 2009-03-16 10:02:06 -07:00
Brian Behlendorf 93643c487f Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-03-12 15:54:13 -07:00
Brian Behlendorf c7979c6f55 Check realpath() return code. 2009-03-12 15:49:23 -07:00
Brian Behlendorf 71bc2e8c03 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-12 15:47:36 -07:00
Brian Behlendorf 59edc6fb4e Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 15:47:27 -07:00
Brian Behlendorf 2a21321766 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-12 15:46:56 -07:00
Brian Behlendorf c399ce1af8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 15:46:45 -07:00
Brian Behlendorf 9e4850e3d1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 15:44:54 -07:00
Brian Behlendorf 65d5ab8f56 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-12 15:44:42 -07:00
Brian Behlendorf 5a7e7e9d3b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 15:44:18 -07:00
Brian Behlendorf 82ce8b00f3 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 15:44:14 -07:00
Brian Behlendorf 6a5acaa105 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 15:44:13 -07:00
Brian Behlendorf 9fe5b916e2 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2009-03-12 15:39:27 -07:00
Brian Behlendorf 9e49df6b20 Add gcc-fortify-source branch 2009-03-12 15:38:51 -07:00
Brian Behlendorf 98e7b9f354 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-12 10:41:02 -07:00
Brian Behlendorf bb06faa046 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 10:40:54 -07:00
Brian Behlendorf 58e63ca4cc Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-12 10:40:17 -07:00
Brian Behlendorf fbbb5fe669 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 10:40:09 -07:00
Brian Behlendorf 45f3d2a2a4 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 10:38:05 -07:00
Brian Behlendorf 5f9ae91a8a Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-12 10:37:50 -07:00
Brian Behlendorf 9bdbd7c8f7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 10:37:18 -07:00
Brian Behlendorf b9b399bf04 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 10:37:14 -07:00
Brian Behlendorf a03187bb3b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 10:37:12 -07:00
Brian Behlendorf f8fe8a76f4 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-12 10:37:11 -07:00
Brian Behlendorf cabd4a69c4 Resolve remaining uninitialized variables 
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
 2009-03-12 10:30:41 -07:00
Brian Behlendorf 8da25a0948 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-12 10:03:39 -07:00
Brian Behlendorf a59f378c54 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 10:03:31 -07:00
Brian Behlendorf 308903afa4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-12 10:02:53 -07:00
Brian Behlendorf 77695eacc1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 10:02:45 -07:00
Brian Behlendorf dcc25c44da Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 10:00:48 -07:00
Brian Behlendorf 8e56c7350f Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-12 10:00:38 -07:00
Brian Behlendorf 0cdc14e427 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 10:00:07 -07:00
Brian Behlendorf dd30dba016 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 10:00:04 -07:00
Brian Behlendorf 193ea156e9 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 10:00:03 -07:00
Brian Behlendorf eceaf813ad Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-03-12 10:00:01 -07:00
Brian Behlendorf f2d72af596 Add remaining missing cases (or a default) to all switch statements. 
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements.  The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
 2009-03-12 09:53:08 -07:00
Brian Behlendorf 396b45acc8 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-12 09:27:52 -07:00
Brian Behlendorf 4f216a686e Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 09:27:43 -07:00
Brian Behlendorf b1687e86ec Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-12 09:27:13 -07:00
Brian Behlendorf 9bee4c8c52 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 09:27:04 -07:00
Brian Behlendorf 13742b3b80 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 09:25:14 -07:00
Brian Behlendorf cb931a10ff Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-12 09:25:05 -07:00
Brian Behlendorf 308a05919a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 09:24:35 -07:00
Brian Behlendorf 2e9568b6be Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 09:24:32 -07:00
Brian Behlendorf fba88e48f2 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-12 09:24:31 -07:00
Brian Behlendorf 9de6723b83 ztest_resume should be ztest_resume_thread in pthread_create() 
Fix an accidental bug introducted by the pthreads changes.  When creating
a resume thread the handler function was accidentally changed from
ztest_resume to ztest_resume_thread.  There's a decent chance this
may explain some/all of the crashes that have be observed running
ztest.  This issue was exposed and easily fixed once the -Wno-unused
check was removed from the build system.  Happily at least one real
bug fix resulted from that cleanup.
 2009-03-12 09:13:40 -07:00
Brian Behlendorf da4d2eea9d Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-03-11 23:10:06 -07:00
Brian Behlendorf 73db9f622c Pull unused err variable under HAVE_DM_INUSE_SWAP ifdef. 2009-03-11 23:05:42 -07:00
Brian Behlendorf 06fd9e48a0 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-11 23:00:04 -07:00
Brian Behlendorf 8aac8753f4 Move 4 unused functions under HAVE_ZPL until implemented. 2009-03-11 22:55:45 -07:00
Brian Behlendorf 0d19b2613b Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-11 22:50:31 -07:00
Brian Behlendorf 1c0279a08f Resolve newly revealed unused vars and symbols caused by topic branch. 2009-03-11 22:43:09 -07:00
Brian Behlendorf 3a9f66d280 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-11 22:29:58 -07:00
Brian Behlendorf 071662bf32 Remove unused variable 2009-03-11 22:14:08 -07:00
Brian Behlendorf 1fcdd63cc6 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-11 21:03:21 -07:00
Brian Behlendorf cb52b25a43 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 21:03:09 -07:00
Brian Behlendorf 9326966d34 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 21:02:37 -07:00
Brian Behlendorf b392fd33fd Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 21:02:27 -07:00
Brian Behlendorf 9c4cc2ae78 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 21:00:25 -07:00
Brian Behlendorf 87094b528c Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-11 21:00:16 -07:00
Brian Behlendorf c351352990 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 20:59:46 -07:00
Brian Behlendorf 4c042de40b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 20:59:43 -07:00
Brian Behlendorf 60ac8152fe Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 20:59:42 -07:00
Brian Behlendorf 9915249546 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-03-11 20:53:11 -07:00
Brian Behlendorf d4dbc7dca8 Resolve all instances of missing braces. 2009-03-11 20:52:21 -07:00
Brian Behlendorf fa2e001fe3 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-11 14:13:47 -07:00
Brian Behlendorf b2041bc8ef Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 14:13:33 -07:00
Brian Behlendorf bd92e256e6 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 14:12:52 -07:00
Brian Behlendorf 330dbde81a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 14:12:39 -07:00
Brian Behlendorf cac68bc478 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 14:09:49 -07:00
Brian Behlendorf 0f0abc8d58 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-11 14:09:36 -07:00
Brian Behlendorf 5afc3db3ce Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 14:08:57 -07:00
Brian Behlendorf 1ca6578ebc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 14:08:51 -07:00
Brian Behlendorf 8a3b1a5ff5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 14:08:50 -07:00
Brian Behlendorf e5011401cd Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-03-11 14:08:48 -07:00
Brian Behlendorf 3226eea157 Resolve additional cases where gcc wants extra parenthesis. 
These were introduced by the rebase to b108.
 2009-03-11 13:57:47 -07:00
Brian Behlendorf e77e7b4dc3 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-11 11:22:35 -07:00
Brian Behlendorf af12291488 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 
Conflicts:
	module/zfs/rrwlock.c
	module/zfs/zfs_replay.c
 2009-03-11 11:22:11 -07:00
Brian Behlendorf a55824aa6a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 11:20:15 -07:00
Brian Behlendorf 261ca2beb9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 11:19:58 -07:00
Brian Behlendorf 47e0037a8b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 11:15:59 -07:00
Brian Behlendorf bc22a004ee Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-11 11:15:40 -07:00
Brian Behlendorf bf200630f9 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/rrwlock.c
	module/zfs/spa_boot.c
	module/zfs/zfs_replay.c
 2009-03-11 11:12:24 -07:00
Brian Behlendorf dff484a388 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 11:09:13 -07:00
Brian Behlendorf 5f30a3cb0e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 11:09:11 -07:00
Brian Behlendorf 8fe801fd8f Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-03-11 11:00:42 -07:00
Ricardo M. Correia af45030850 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
Brian Behlendorf ab3f1d72e8 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-03-11 10:45:02 -07:00
Brian Behlendorf 2ff4ee3cae Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 10:44:51 -07:00
Brian Behlendorf 2d756b5ea3 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 10:44:10 -07:00
Brian Behlendorf 2be3b720b9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 10:43:59 -07:00
Brian Behlendorf e42874df99 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 10:41:25 -07:00
Brian Behlendorf 762bbd3368 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-11 10:41:10 -07:00
Brian Behlendorf 73c738d1ce Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 10:40:37 -07:00
Brian Behlendorf 8eaf19dae8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 10:40:33 -07:00
Brian Behlendorf d43e9ca262 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 10:40:31 -07:00
Brian Behlendorf d641369d38 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-03-11 10:32:45 -07:00
Ricardo M. Correia fd9a7a0fb4 Add 'ull' suffix to 64-bit constants. 2009-03-11 10:31:24 -07:00
Brian Behlendorf 29946892d9 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-19 14:57:29 -08:00
Brian Behlendorf ddfa570f42 Initial update to support zpios.sh profiling option. 2009-02-19 14:51:40 -08:00
Brian Behlendorf 023a02025f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-19 13:58:27 -08:00
Brian Behlendorf 5ae73585fb Cleanup zpios option handling 2009-02-19 13:53:17 -08:00
Brian Behlendorf d3f070026f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-19 13:02:01 -08:00
Brian Behlendorf 23710f1308 Minor zpios cleanup plus addition of --nowait feature 2009-02-19 12:56:50 -08:00
Brian Behlendorf 3bef977501 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-02-18 14:38:45 -08:00
Brian Behlendorf 7b8eca908f Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 
Conflicts:

	cmd/zpool/zpool_main.c
 2009-02-18 14:38:20 -08:00
Brian Behlendorf b3d7657ea0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-18 14:37:01 -08:00
Brian Behlendorf 437bc77985 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-02-18 14:36:49 -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 7e21796d7e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-02-18 14:33:48 -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 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 fc8954db24 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-02-18 13:12:48 -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 6cb1ac2d49 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-13 12:19:24 -08:00
Brian Behlendorf 68346c54fe Misnamed --load option sff changed to ssf 2009-02-13 12:07:34 -08:00
Brian Behlendorf 4f715bee61 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-15 15:56:30 -08:00
Brian Behlendorf b53602e7c0 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 15:56:25 -08:00
Brian Behlendorf 4144f1ed75 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 15:56:09 -08:00
Brian Behlendorf 941807d6be Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 15:56:04 -08:00
Brian Behlendorf f21c45793f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-15 15:54:58 -08:00
Brian Behlendorf 8bc4bdbdc5 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-15 15:54:53 -08:00
Brian Behlendorf 20d418a96c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 15:54:39 -08:00
Brian Behlendorf 85c77e1c82 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:54:35 -08:00
Brian Behlendorf ee7f10a6b3 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 15:54:34 -08:00
Brian Behlendorf cf9a5530e1 Fix pthreads prototype 2009-01-15 15:52:12 -08:00
Brian Behlendorf 48e92c8c9d Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-15 15:42:31 -08:00
Brian Behlendorf 49e805ee3e Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 15:42:26 -08:00
Brian Behlendorf 4662f38b69 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 15:42:10 -08:00
Brian Behlendorf 494d56c4dd Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 15:42:05 -08:00
Brian Behlendorf 08567d3be9 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-15 15:41:01 -08:00
Brian Behlendorf c41eda4350 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-15 15:40:56 -08:00
Brian Behlendorf de2098cc11 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 15:40:42 -08:00
Brian Behlendorf 0197f3a298 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 975c613269 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 51730cdeae Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:40:37 -08:00
Brian Behlendorf 37a3478d58 Resolve C90 int declared in for() construct 2009-01-15 15:38:26 -08:00
Brian Behlendorf 2a0e254804 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-15 14:22:20 -08:00
Brian Behlendorf adcb983918 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 14:22:14 -08:00
Brian Behlendorf de66052064 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 14:21:55 -08:00
Brian Behlendorf df7ad715a9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 14:21: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 fd0e369487 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-15 14:19:00 -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 da7151a89e Resolve conflict with removed cleaner type 2009-01-15 14:11:19 -08:00
Brian Behlendorf 86e39f5e3b Resolve conflict with removed cleaner type 2009-01-15 14:05:21 -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 0d8e925476 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-14 16:05:17 -08:00
Brian Behlendorf 37e2d99e39 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-14 16:05:09 -08:00
Brian Behlendorf 9339984f08 Resolve conflict 2009-01-14 16:04:33 -08:00
Brian Behlendorf b00ebbc449 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-14 15:44:26 -08:00
Brian Behlendorf 8946662029 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-14 15:43:26 -08:00
Brian Behlendorf fe23ec2be6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-14 15:43:21 -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 24ee934b8b Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-01-14 13:39:05 -08:00
Brian Behlendorf 6db77d2fe2 Add linux-ztest branch 2009-01-14 13:38:07 -08:00
Brian Behlendorf 50832652c2 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-14 08:42:33 -08:00
Brian Behlendorf 1194e0412f Change all instances of kpios to zpios 2009-01-14 08:38:35 -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 0e00972b2a Resolve conflict 2009-01-05 12:42:30 -08:00
Brian Behlendorf 681ba5c296 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-05 12:41:42 -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 ce248fc03d Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 12:39:45 -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 150630eccd Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 11:23:13 -08:00
Brian Behlendorf fa7980f197 Remove zdump 2009-01-05 11:22:57 -08:00
Brian Behlendorf 3340446a73 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-05 11:22:25 -08:00
Brian Behlendorf 71102ea91e Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-05 11:21:28 -08:00
Brian Behlendorf 0b35a8c9c6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 11:21:24 -08:00
Brian Behlendorf e3b6de2c22 Remove zdump 2009-01-05 11:20:33 -08:00
Brian Behlendorf 6fd7b17036 Remove remaining zdump Makefile references 2009-01-05 11:18:06 -08:00
Brian Behlendorf ca7e851794 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 11:16:26 -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 045d42028a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-05 11:16:07 -08:00
Brian Behlendorf 9eaf63425e Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-05 11:15:08 -08:00
Brian Behlendorf 95ce3565a9 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 11:15:03 -08:00
Brian Behlendorf ef0ca51855 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 11:14:50 -08:00