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

214 Commits

Author SHA1 Message Date
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 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 53247399a0 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-06 15:42:24 -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 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 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 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 2a744e0bbb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-05-22 16:38:43 -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 d24362e80b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-20 09:33:38 -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 f764039e87 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 21:32:26 -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 4f2dfa3c94 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 21:13:11 -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 7a87dfebb8 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 19:58:30 -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 1eb357eeb1 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-18 14:40:02 -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 53edd221ff Pull unused get_one_dataset() under HAVE_ZPL ifdef. 2009-03-16 11:14:19 -07:00