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

218 Commits

Author SHA1 Message Date
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 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 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 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 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 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 4e048c65aa Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-05-22 16:38:14 -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 0826ebc008 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-20 09:32:50 -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 6756c613c1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 21:31:38 -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 a676a29d25 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 21:11:25 -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 240445807b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 19:57:13 -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 c7cc10351e Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-18 14:38:48 -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 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 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 c399ce1af8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 15:46:45 -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