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
d545a922f2
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-02 16:55:27 -07:00
eb0137f395
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
2009-07-02 16:55:22 -07:00
7eceb3b637
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-07-02 16:52:12 -07:00
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
0010c8c466
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-07-02 16:51:11 -07:00
5a2a5d64a5
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-07-02 16:51:09 -07:00
01f0f6a036
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-07-02 16:51:06 -07:00
f473a898f4
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-07-02 16:51:04 -07:00
dbe960383e
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-07-02 16:51:01 -07:00
0a437a8b22
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-07-02 16:51:00 -07:00
546408e1de
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-07-02 16:50:56 -07:00
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
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
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
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
e1d6e67473
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-05-22 16:36:23 -07:00
9c59a63d91
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-05-22 16:36:22 -07:00
e56aa929e8
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-05-22 16:36:22 -07:00
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
0c88bc3ccd
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-20 09:29:21 -07:00
fe77fb7907
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-03-20 09:29:17 -07:00
9476bd93ca
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-20 09:29:17 -07:00
13814fe220
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-03-20 09:29:16 -07:00
99da5f93e8
Fix uninitialized variable error in ztest_dmu_commit_callbacks()
2009-03-20 09:20:49 -07:00
1769e10f17
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-19 21:28:50 -07:00
a891a11671
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-03-19 21:28:48 -07:00
6d883d7d40
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 21:28:48 -07:00
63781842e3
Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.
2009-03-19 21:21:35 -07:00
64684cadfa
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-03-19 21:19:28 -07:00
fed604c844
Add extra () requested by gcc
2009-03-19 21:18:54 -07:00
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
a71161249a
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 20:57:53 -07:00
c89153393f
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-03-19 20:51:18 -07:00
f180959bac
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 20:51:18 -07:00
a32dc3b04b
New TopGit dependency: feature-pthreads
2009-03-19 20:51:17 -07:00
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
182e9e0973
Remove 'fix-pthreads' dependency from 'fix-branch'
2009-03-19 19:59:10 -07:00
8cdcf1ef44
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 19:49:55 -07:00
05cec154f5
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-03-19 19:49:53 -07:00
f681a33757
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-03-19 19:49:53 -07:00
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -07:00
2518c98d9e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:29:34 -07:00
c8c4948d00
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-03-19 15:29:33 -07:00
97d74db433
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-03-19 15:29:33 -07:00
60d25f4b93
The patch resolves the extra call to dnode_cons() in dnode_create().
...
The extra call to the constructor was there to reinitialize the non-
trivial primatives in the dnode (lists, mutexs, condvars, avl tree, etc).
This was safe, although not exactly clean, on Solaris because none of
the primitives allocate memory. In the Linux port this is not true.
To keep stack usage to a minimum several of the primatives dynamically
allocate memory thus initializing them twice results in a memory leak.
This patch resolves this problem for Solaris and Linux by ensuring all
*_inits are called in the constructor, and all *_destroys are called
in the destructor. Additionally we ensure that all dnode objects are
properly deconstructed before being freed to the slab, and when the
objects are allocated from the slab all required data members are
explicity initialized to correct values.
2009-03-19 15:22:48 -07:00
f07d61a8c1
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:07:18 -07:00
8d41b083fe
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-03-19 15:07:17 -07:00
cc032b6337
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-03-19 15:07:16 -07:00
Brian Behlendorf