f3dc6d4e58
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-07-06 13:13:05 -07:00
ac96ab67ed
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-07-06 13:13:05 -07:00
9f1627af07
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-07-06 13:12:59 -07:00
6f31ab380c
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-07-06 13:12:59 -07:00
e320858042
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-07-06 13:12:54 -07:00
ea95d72db5
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-07-06 13:12:54 -07:00
2c4280a680
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2009-07-06 13:12:49 -07:00
afaf8092eb
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2009-07-06 13:12:49 -07:00
eaba5df9af
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-07-06 13:12:44 -07:00
4bf249a931
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2009-07-06 13:12:44 -07:00
75b6de8e83
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-07-06 13:12:39 -07:00
021d679b95
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-07-06 13:12:39 -07:00
5b629493e0
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-07-06 13:12:34 -07:00
f8f0e924eb
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2009-07-06 13:12:34 -07:00
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
3ada0935a3
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-07-06 13:11:56 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
05cec154f5
Merge branch 'fix-pthreads' into refs/top-bases/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
c8c4948d00
Merge branch 'fix-dnode-cons' into refs/top-bases/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
cc032b6337
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-03-19 15:07:16 -07:00
9bbf8f1761
Resolve conflict with fix-dnode-cons
2009-03-19 15:02:05 -07:00
9818e69640
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-03-16 10:12:01 -07:00
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
c4e10eb3df
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-03-12 15:21:30 -07:00
f1f9c50dd9
Add fix-strncat branch which corrects a buffer overrun.
2009-03-12 15:20:26 -07:00
50c68324fe
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-03-12 09:24:29 -07:00
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
4e50779f44
Merge branch 'fix-list' into refs/top-bases/fix-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:30:38 -08:00
dbc3a5ec55
Merge commit 'refs/top-bases/fix-list' into fix-list
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:29:48 -08:00
4cc0df153d
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-02-18 14:29:24 -08:00
3ef12f42a2
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-02-18 14:29:23 -08:00
f257cc3a9e
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-02-18 14:29:20 -08:00
7fe1b71533
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-02-18 14:29:19 -08:00
56aabda0f9
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-02-18 14:29:16 -08:00
d3bf596f03
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-02-18 14:29:16 -08:00
463205c1bb
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-02-18 14:29:12 -08:00
15f5ddebdf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
...
Conflicts:
lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
baf389bedc
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-02-18 14:28:46 -08:00
0c0f306f14
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-02-18 14:28:46 -08:00
40839628e9
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-02-18 14:28:43 -08:00
f3f9572ef9
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-02-18 14:28:42 -08:00
fa06351125
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-02-18 14:28:39 -08:00
109a1d5b16
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-02-18 14:28:38 -08:00
224985aa70
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2009-02-18 14:28:34 -08:00
0dd5d4dae3
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2009-02-18 14:28:34 -08:00
e3f59d5034
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2009-02-18 14:28:31 -08:00
d6e8154947
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-02-18 14:28:30 -08:00
145bd84478
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-02-18 14:28:28 -08:00
Brian Behlendorf