f39882ec1f
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-07-21 10:08:24 -07:00
e16508d660
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-07-21 10:08:23 -07:00
a2cf158872
Merge branch 'fix-stack-ztest' into refs/top-bases/fix-branch
2010-07-21 10:08:22 -07:00
8d6a2d0626
Merge commit 'refs/top-bases/fix-stack-ztest' into fix-stack-ztest
2010-07-21 10:08:22 -07:00
75d868af70
Fixed typo that set thread STACK_SIZE to 24k instead of 8k
...
__linux__ was mispelled as _linux_ so #ifdef was always
selecting the Solaris STACK_SIZE value.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-21 10:04:21 -07:00
4b576456c7
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-07-12 10:23:04 -07:00
930b48bd2c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-07-12 10:23:03 -07:00
b1ac2755a0
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-07-12 10:23:03 -07:00
007b891fc7
Fix -Werror=format-security compiler option
...
Noticed under Ubuntu kernel builds, there were two instances where
printf() was not called with a "%s" and instread directly printed
the string. This can potentially result in a crash and is considered
bad form by gcc. It has been fixed by adding the needed "%s".
2010-07-12 10:11:48 -07:00
428d8d8a9b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-07-01 10:42:00 -07:00
6de663ff06
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-07-01 10:41:59 -07:00
049a26b800
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-07-01 10:41:59 -07:00
3b54f5030e
Use VERIFY() for asprintf due to rpm -D_FORTIFY_SOURCE=2
...
This check is part of ztest and a memory failure here is unlikely.
However, if this does occur simply exiting is an perfectly valid
way to handle the issue and it resulves the compiler warning.
ztest.c:5522: error: ignoring return value of 'asprintf',
declared with attribute warn_unused_result
2010-07-01 10:35:11 -07:00
5387c446cf
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-29 16:57:41 -07:00
1a58b78499
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-29 16:57:39 -07:00
015677660a
Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch
2010-06-29 16:57:39 -07:00
f20301b41b
Minor fix to ensure tv_depth is there when debugging is disabled.
2010-06-29 16:52:42 -07:00
3d207a1f0d
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-29 14:41:37 -07:00
ddb3357f4b
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-29 14:41:35 -07:00
b8bafc851f
Merge branch 'fix-stack-ztest' into refs/top-bases/fix-branch
2010-06-29 14:41:35 -07:00
d0ddee3859
Merge commit 'refs/top-bases/fix-stack-ztest' into fix-stack-ztest
2010-06-29 14:41:34 -07:00
213d6423b5
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
2010-06-29 14:41:34 -07:00
c366e466e3
Merge commit 'refs/top-bases/fix-stack-traverse_visitbp' into fix-stack-traverse_visitbp
2010-06-29 14:41:32 -07:00
f47cc9aac2
Merge branch 'fix-stack-traverse_visitbp' into refs/top-bases/fix-branch
2010-06-29 14:41:32 -07:00
4b23500c4a
Merge branch 'fix-stack-traverse_impl' into refs/top-bases/fix-branch
2010-06-29 14:41:31 -07:00
490eb4db5c
Merge commit 'refs/top-bases/fix-stack-traverse_impl' into fix-stack-traverse_impl
2010-06-29 14:41:30 -07:00
daef43003b
Merge branch 'fix-stack-vn_open' into refs/top-bases/fix-branch
2010-06-29 14:41:29 -07:00
861af03304
Merge commit 'refs/top-bases/fix-stack-vn_open' into fix-stack-vn_open
2010-06-29 14:41:28 -07:00
33b9043394
Merge branch 'fix-stack-dsl_dataset_destroy' into refs/top-bases/fix-branch
2010-06-29 14:41:27 -07:00
5721f147c5
Merge commit 'refs/top-bases/fix-stack-dsl_dataset_destroy' into fix-stack-dsl_dataset_destroy
2010-06-29 14:41:27 -07:00
46acb1b8d2
Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch
2010-06-29 14:41:25 -07:00
50c15019cb
Merge commit 'refs/top-bases/fix-stack-dmu_objset_snapshot' into fix-stack-dmu_objset_snapshot
2010-06-29 14:41:25 -07:00
b8b1c5abb9
Merge branch 'fix-stack-noinline' into refs/top-bases/fix-branch
2010-06-29 14:41:24 -07:00
002a52896d
Merge commit 'refs/top-bases/fix-stack-noinline' into fix-stack-noinline
2010-06-29 14:41:23 -07:00
f568df2d32
Merge branch 'fix-stack-dsl_deleg_get' into refs/top-bases/fix-branch
2010-06-29 14:41:22 -07:00
89cd45bf85
Merge commit 'refs/top-bases/fix-stack-dsl_deleg_get' into fix-stack-dsl_deleg_get
2010-06-29 14:41:22 -07:00
4e8810b3ff
Merge branch 'fix-stack-dsl_dir_open_spa' into refs/top-bases/fix-branch
2010-06-29 14:41:20 -07:00
fd66f491b4
Merge commit 'refs/top-bases/fix-stack-dsl_dir_open_spa' into fix-stack-dsl_dir_open_spa
2010-06-29 14:41:20 -07:00
eed68d5e3f
Merge branch 'fix-stack-lzjb' into refs/top-bases/fix-branch
2010-06-29 14:41:19 -07:00
1badbf8463
Merge commit 'refs/top-bases/fix-stack-lzjb' into fix-stack-lzjb
2010-06-29 14:41:18 -07:00
9559cbca21
Merge branch 'fix-kstat-xuio' into refs/top-bases/fix-branch
2010-06-29 14:41:17 -07:00
ec6656eadc
Merge commit 'refs/top-bases/fix-kstat-xuio' into fix-kstat-xuio
2010-06-29 14:41:17 -07:00
73cf09d2ec
Merge branch 'fix-metaslab' into refs/top-bases/fix-branch
2010-06-29 14:41:16 -07:00
3cddd49624
Merge commit 'refs/top-bases/fix-metaslab' into fix-metaslab
2010-06-29 14:41:15 -07:00
01df3b60cc
Merge branch 'fix-current' into refs/top-bases/fix-branch
2010-06-29 14:41:14 -07:00
92b4f42d0f
Merge commit 'refs/top-bases/fix-current' into fix-current
2010-06-29 14:41:14 -07:00
f41eaa2d5c
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-06-29 14:41:12 -07:00
0f77e365da
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-06-29 14:41:12 -07:00
1c7f88de99
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-06-29 14:41:11 -07:00
07e889a8bd
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-06-29 14:41:10 -07:00
Brian Behlendorf
Ned Bass