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

2951 Commits

Author SHA1 Message Date
Brian Behlendorf 9fa832ed93 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 15:45:43 -07:00
Brian Behlendorf e27754d9e8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 
Conflicts:
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_sendrecv.c
	module/zfs/dmu_objset.c
	module/zfs/dnode.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/txg.h
	module/zfs/spa_history.c
 2010-05-28 15:45:38 -07:00
Brian Behlendorf 06a45ce57e Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-05-28 15:39:13 -07:00
Brian Behlendorf 6538095cdd Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2010-05-28 15:39:12 -07:00
Brian Behlendorf 06ba6dc528 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 
Conflicts:
	lib/libzfs/libzfs_pool.c
 2010-05-28 15:39:07 -07:00
Brian Behlendorf 0b0deba9fc Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-05-28 15:38:49 -07:00
Brian Behlendorf 547c06e594 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2010-05-28 15:38:49 -07:00
Brian Behlendorf ffaa677995 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 
Conflicts:
	module/zfs/dbuf.c
	module/zfs/dsl_dataset.c
 2010-05-28 15:38:43 -07:00
Brian Behlendorf 408ad63b2f Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-05-28 15:38:11 -07:00
Brian Behlendorf 6fc05373e6 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-05-28 15:38:11 -07:00
Brian Behlendorf 3ac26c7efb Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-05-28 15:38:11 -07:00
Brian Behlendorf d8f9623833 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 
Conflicts:
	cmd/zdb/zdb_il.c
 2010-05-28 15:38:05 -07:00
Brian Behlendorf 0df35b3599 Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2010-05-28 15:37:36 -07:00
Brian Behlendorf 1c04248a45 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2010-05-28 15:37:35 -07:00
Brian Behlendorf 97352d5103 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 
Conflicts:
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c
 2010-05-28 15:37:31 -07:00
Brian Behlendorf 3e2be634a5 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 
Conflicts:
	cmd/zdb/zdb.c
	cmd/zdb/zdb_il.c
	cmd/zfs/zfs_main.c
	cmd/zfs/zfs_util.h
	cmd/zinject/zinject.h
	cmd/zpool/zpool_main.c
	cmd/zpool/zpool_util.c
	cmd/ztest/ztest.c
	lib/libnvpair/include/libnvpair.h
	lib/libnvpair/libnvpair.c
	lib/libzfs/libzfs_changelist.c
	lib/libzfs/libzfs_config.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_import.c
	lib/libzfs/libzfs_mount.c
	lib/libzfs/libzfs_pool.c
	lib/libzfs/libzfs_sendrecv.c
	module/avl/avl.c
	module/avl/include/sys/avl.h
	module/nvpair/include/sys/nvpair.h
	module/nvpair/nvpair.c
	module/zcommon/include/zfs_comutil.h
	module/zcommon/include/zfs_prop.h
	module/zcommon/zfs_comutil.c
	module/zfs/arc.c
	module/zfs/dbuf.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dmu_zfetch.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_pool.c
	module/zfs/dsl_prop.c
	module/zfs/dsl_synctask.c
	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/dmu_zfetch.h
	module/zfs/include/sys/dsl_synctask.h
	module/zfs/include/sys/refcount.h
	module/zfs/include/sys/txg.h
	module/zfs/include/sys/uberblock.h
	module/zfs/include/sys/zap_leaf.h
	module/zfs/include/sys/zfs_debug.h
	module/zfs/include/sys/zfs_znode.h
	module/zfs/include/sys/zio_compress.h
	module/zfs/include/sys/zvol.h
	module/zfs/lzjb.c
	module/zfs/metaslab.c
	module/zfs/refcount.c
	module/zfs/sha256.c
	module/zfs/spa.c
	module/zfs/spa_boot.c
	module/zfs/uberblock.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_replay.c
	module/zfs/zio.c
	module/zfs/zio_compress.c
 2010-05-28 15:34:57 -07:00
Brian Behlendorf d60fc5ca30 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 
Conflicts:
	module/zfs/dbuf.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_prop.c
	module/zfs/metaslab.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
 2010-05-28 15:07:36 -07:00
Brian Behlendorf cd47feb3c8 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 
Conflicts:
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c
	module/zfs/arc.c
 2010-05-28 14:56:00 -07:00
Brian Behlendorf 28e07224db Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 
Conflicts:
	lib/libzfs/libzfs_dataset.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_pool.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c
	module/zfs/zio.c
 2010-05-28 14:54:33 -07:00
Brian Behlendorf abfb2a3e1d Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 
Conflicts:
	lib/libzfs/libzfs_changelist.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c
 2010-05-28 14:49:40 -07:00
Brian Behlendorf 3571832262 Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 
Conflicts:
	cmd/zdb/zdb.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_pool.c
	lib/libzfs/libzfs_sendrecv.c
 2010-05-28 14:46:39 -07:00
Brian Behlendorf 2591cac812 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 
Conflicts:
	cmd/zdb/zdb_il.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_mount.c
 2010-05-28 14:42:40 -07:00
Brian Behlendorf 3d7dbfd793 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 
Conflicts:
	lib/libzfs/libzfs_mount.c
 2010-05-28 14:38:23 -07:00
Brian Behlendorf 1be88bcba0 Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source 
Conflicts:
	cmd/zdb/zdb.c
 2010-05-28 14:37:39 -07:00
Brian Behlendorf e1106c237c Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2010-05-28 14:36:35 -07:00
Brian Behlendorf 475bf41d1c Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 
Conflicts:
	cmd/zfs/zfs_main.c
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c
 2010-05-28 14:36:18 -07:00
Brian Behlendorf 688aff8f98 Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 
Conflicts:
	cmd/ztest/ztest.c
	module/zfs/include/sys/zfs_znode.h
 2010-05-28 14:30:54 -07:00
Brian Behlendorf 0c35ee68a3 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 
Conflicts:
	cmd/zfs/zfs_util.h
	cmd/zinject/zinject.h
	cmd/zpool/zpool_util.c
	lib/libnvpair/include/libnvpair.h
	lib/libnvpair/libnvpair.c
	lib/libzfs/libzfs_config.c
	lib/libzfs/libzfs_import.c
	module/avl/avl.c
	module/avl/include/sys/avl.h
	module/nvpair/include/sys/nvpair.h
	module/nvpair/nvpair.c
	module/zcommon/include/zfs_comutil.h
	module/zcommon/include/zfs_prop.h
	module/zcommon/zfs_comutil.c
	module/zfs/dmu_zfetch.c
	module/zfs/dsl_synctask.c
	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/dmu_zfetch.h
	module/zfs/include/sys/dsl_synctask.h
	module/zfs/include/sys/refcount.h
	module/zfs/include/sys/txg.h
	module/zfs/include/sys/uberblock.h
	module/zfs/include/sys/zap_leaf.h
	module/zfs/include/sys/zfs_debug.h
	module/zfs/include/sys/zio_compress.h
	module/zfs/include/sys/zvol.h
	module/zfs/lzjb.c
	module/zfs/refcount.c
	module/zfs/sha256.c
	module/zfs/spa_boot.c
	module/zfs/uberblock.c
	module/zfs/zfs_replay.c
	module/zfs/zio_compress.c
 2010-05-28 14:28:49 -07:00
Brian Behlendorf 957b7b41d4 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 
Conflicts:
	cmd/zdb/zdb.c
	cmd/ztest/ztest.c
	module/zfs/dbuf.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_scrub.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zio.c
 2010-05-28 14:19:22 -07:00
Brian Behlendorf 2de855c46f Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-28 13:54:54 -07:00
Brian Behlendorf 2d4cd584e7 Merge branch 'fix-error-handling' into refs/top-bases/fix-branch 2010-05-28 13:54:54 -07:00
Brian Behlendorf b80e7c8069 Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling 2010-05-28 13:54:54 -07:00
Brian Behlendorf f6df7f8782 Merge branch 'fix-acl' into refs/top-bases/fix-branch 2010-05-28 13:54:53 -07:00
Brian Behlendorf 683c459a72 Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2010-05-28 13:54:53 -07:00
Brian Behlendorf 877bb02a78 Merge commit 'refs/top-bases/fix-acl' into fix-acl 2010-05-28 13:54:53 -07:00
Brian Behlendorf 0f28de26db Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2010-05-28 13:54:52 -07:00
Brian Behlendorf 2b40ca1456 Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode 2010-05-28 13:54:52 -07:00
Brian Behlendorf 6c1f1ca76b Merge commit 'refs/top-bases/fix-strncat' into fix-strncat 
Conflicts:
	lib/libzfs/libzfs_sendrecv.c
 2010-05-28 13:54:49 -07:00
Brian Behlendorf 0c7850b688 Merge branch 'fix-list' into refs/top-bases/fix-branch 2010-05-28 13:54:13 -07:00
Brian Behlendorf c53061c5af Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-05-28 13:54:12 -07:00
Brian Behlendorf 016808b9e9 Merge commit 'refs/top-bases/fix-list' into fix-list 2010-05-28 13:54:12 -07:00
Brian Behlendorf 2c67a5a29d Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-05-28 13:54:12 -07:00
Brian Behlendorf 4bcccd352e Merge branch 'fix-stack' into refs/top-bases/fix-branch 2010-05-28 13:54:11 -07:00
Brian Behlendorf 89089d1e4b Merge commit 'refs/top-bases/fix-stack' into fix-stack 
Conflicts:
	module/zfs/dmu_objset.c
	module/zfs/spa_history.c
 2010-05-28 13:54:08 -07:00
Brian Behlendorf be688941e5 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2010-05-28 13:52:55 -07:00
Brian Behlendorf 0d4d1a7861 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 
Conflicts:
	module/zfs/dsl_dataset.c
 2010-05-28 13:52:52 -07:00
Brian Behlendorf 0c6ebd6b14 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2010-05-28 13:52:29 -07:00
Brian Behlendorf 39f5f90c1a Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2010-05-28 13:52:29 -07:00
Brian Behlendorf 0a7f819adf Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2010-05-28 13:52:28 -07:00
Brian Behlendorf 141b42bae9 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2010-05-28 13:52:28 -07:00