d134105bba
Linux 2.6.34 compat: add_range() symbol collision
...
The prototype for an add_range() function was added to the kernel
header include/linux/range.h which conflicts with the static
add_range() defined in zfs_fm.c. To resolve the conflict all
range functions in zfs_fm.c have been prefixed with zei which
is short for the zfs_ecksum_info struct since all of these
functions operate on that base structure.
2010-07-12 10:13:07 -07:00
bf89df82e4
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-02 14:04:23 -07:00
77f748fd1c
Allow config/build to work with autoconf-2.65
...
As of autoconf-2.65 the AC_LANG_SOURCE source macro no longer
includes the confdef.h results when expanded. To handle this
simply explicitly include confdef.h in conftest.c. This will
cause two copies to of confdef.h to be added to the test for
earlier autoconf versions but this is not harmful.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-02 13:56:00 -07:00
6065ea087f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-01 20:47:36 -07:00
61119d3f5b
Linux-2.6.33 compat, check <generated/utsrelease.h> for UTS_RELEASE
...
It seems the upstream community moved the definition of UTS_RELEASE
yet again as of linux-2.6.33. Update the build system to check in
all three possible locations where your kernel version may be defined.
$kernelbuild/include/linux/version.h
$kernelbuild/include/linux/utsrelease.h
$kernelbuild/include/generated/utsrelease.h
2010-07-01 20:43:36 -07:00
dc6723965d
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-01 10:44:09 -07:00
7f54d558c9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-07-01 10:42:01 -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
8db31e251d
Update zfs.spec.in to reference updated README.markdown file
...
The spec file references the README by the previous name which
has changed to make it github friendly. This results in an
rpm build failure.
2010-07-01 10:36:00 -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
e983ee681f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-29 16:59:40 -07:00
5387c446cf
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-29 16:57:41 -07:00
f28ca65b92
Merge commit 'refs/top-bases/zfs-branch' into 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
6f1eda0629
Add configure check for -Wframe-larger-than=<size>
...
It turns out the gcc option -Wframe-larger-than=<size> which I recently
added to the build system is not supported in older versions of gcc.
Since this is just a flag to ensure I keep stack usage under control
I've added a configure check to detect if gcc supports it. If it's
available we use it in the proper places, if it's not we don't.
2010-06-29 16:53:02 -07:00
f20301b41b
Minor fix to ensure tv_depth is there when debugging is disabled.
2010-06-29 16:52:42 -07:00
e9d7f4ae7c
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-29 14:43:34 -07:00
91f416b497
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-29 14:41:38 -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
Brian Behlendorf
Lars Johannsen