Brian Behlendorf
69d994bbe9
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-19 21:32:36 -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
9ab7adb553
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-19 21:13:22 -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
82c7af8987
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-19 19:58:40 -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
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -07:00
Brian Behlendorf
c7979c6f55
Check realpath() return code.
2009-03-12 15:49:23 -07:00
Brian Behlendorf
71bc2e8c03
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 15:47:36 -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
Brian Behlendorf
98e7b9f354
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 10:41:02 -07:00
Brian Behlendorf
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
Brian Behlendorf
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
Brian Behlendorf
cabd4a69c4
Resolve remaining uninitialized variables
...
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
2009-03-12 10:30:41 -07:00
Brian Behlendorf
396b45acc8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-12 09:27:52 -07:00
Brian Behlendorf
fba88e48f2
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-12 09:24:31 -07:00
Brian Behlendorf
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
Brian Behlendorf
1fcdd63cc6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 21:03:21 -07:00
Brian Behlendorf
60ac8152fe
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 20:59:42 -07:00
Brian Behlendorf
9915249546
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-03-11 20:53:11 -07:00
Brian Behlendorf
d4dbc7dca8
Resolve all instances of missing braces.
2009-03-11 20:52:21 -07:00
Brian Behlendorf
ab3f1d72e8
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-03-11 10:45:02 -07:00
Brian Behlendorf
d43e9ca262
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 10:40:31 -07:00
Brian Behlendorf
d641369d38
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-03-11 10:32:45 -07:00
Ricardo M. Correia
fd9a7a0fb4
Add 'ull' suffix to 64-bit constants.
2009-03-11 10:31:24 -07:00
Brian Behlendorf
4f715bee61
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-15 15:56:30 -08:00
Brian Behlendorf
ee7f10a6b3
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-15 15:54:34 -08:00
Brian Behlendorf
cf9a5530e1
Fix pthreads prototype
2009-01-15 15:52:12 -08:00
Brian Behlendorf
2a0e254804
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-15 14:22:20 -08:00
Brian Behlendorf
a42707fcc0
Resolve conflict with removed cleaner type
2009-01-15 14:16:03 -08:00
Brian Behlendorf
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
Brian Behlendorf
86e39f5e3b
Resolve conflict with removed cleaner type
2009-01-15 14:05:21 -08:00
Brian Behlendorf
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
Brian Behlendorf
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00
Brian Behlendorf
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
Brian Behlendorf
6db77d2fe2
Add linux-ztest branch
2009-01-14 13:38:07 -08:00
Brian Behlendorf
0844495710
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 16:55:58 -08:00
Brian Behlendorf
f3d55cb4f5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 16:55:52 -08:00
Brian Behlendorf
30b961af2c
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 16:55:50 -08:00
Brian Behlendorf
9ef0280a5c
Use pthread_
2008-12-22 16:51:28 -08:00
Brian Behlendorf
683f0b1d6c
Fix cast
2008-12-22 16:50:44 -08:00
Brian Behlendorf
e8e738e3b9
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 16:40:34 -08:00
Brian Behlendorf
f016a8e15f
Update patch carried forward from old release
2008-12-22 16:35:36 -08:00
Brian Behlendorf
43abce68c5
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 16:30:35 -08:00
Brian Behlendorf
8ab0586445
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 16:30:29 -08:00
Brian Behlendorf
a6152094d0
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 16:30:27 -08:00
Brian Behlendorf
dee065ca8d
Use pthread versions
2008-12-22 16:26:23 -08:00
Brian Behlendorf
6a394806f5
Prototype fixes
2008-12-22 16:18:07 -08:00
Brian Behlendorf
cc92d6497b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 11:05:49 -08:00
Brian Behlendorf
9041f66bad
Fix all instances of for (int i;;) {} that were easily found
2008-12-19 11:03:54 -08:00
Brian Behlendorf
f07f82e93a
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
2008-12-11 11:26:43 -08:00
Brian Behlendorf
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
Brian Behlendorf
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00