Brian Behlendorf
e320858042
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-07-06 13:12:54 -07:00
Brian Behlendorf
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
Brian Behlendorf
a1ccb00b7e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
module/zfs/zil.c
2009-07-06 13:11:34 -07:00
Brian Behlendorf
480b03791d
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
...
Conflicts:
lib/libzfs/libzfs_dataset.c
2009-07-02 17:07:52 -07:00
Brian Behlendorf
244d656e28
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-07-02 16:59:39 -07:00
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
Brian Behlendorf
212ecc6560
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-01 11:10:44 -07:00
Brian Behlendorf
ef0a712858
Distro friendly build system / packaging improvements.
...
These changes bring the zfs-0.4.4 tree in to compliance with
the spl-0.4.4 packaging changes. The bottom line is 2 source
rpms and 4 binary rpms will now be generated when creating
packages there will be:
zfs-<version>.src.rpm
- Fully rebuildable source rpm for libzfs and utils.
zfs-modules-<version>.src.rpm
- Fully rebuildable source rpm for kernel modules.
zfs-<version>.<arch>.rpm
- Binary rpm for libzfs and utils. The utils in this package are
compatible with all zfs-module rpms of the same version.
zfs-devel-<version>.<arch>.rpm
- Binary rpm containing headers for building against libzfs libraries.
zfs-modules-<verion>-<kernel>.arch.rpm
- Binary rpm containing the kernel modules for a specific kernel build.
The package name contains the kernel version and you should have one
of these packages installed to match every kernel on your system.
zfs-modules-devel-<verion>-<kernel>.arch.rpm
- Binary rpm containing development header and module symbols needed
for building additional kernel modules which are dependent on the
zfs module stack.
Expect minor interations on these changes as I validate they work
properly on CHAOS, RHEL, Fedora, and SLES style distros.
2009-07-01 10:53:05 -07:00
Brian Behlendorf
4ed190513e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 21:08:51 -07:00
Brian Behlendorf
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -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
76022f22f7
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 19:56:19 -07:00
Brian Behlendorf
8c43ad3853
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 19:49:56 -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
05cec154f5
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-03-19 19:49:53 -07:00
Brian Behlendorf
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -07:00
Brian Behlendorf
c72f5112d3
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-16 16:20:45 -07:00
Brian Behlendorf
df985d53db
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 16:17:57 -07:00
Brian Behlendorf
f86b52a39d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-16 16:17:55 -07:00
Brian Behlendorf
3eebe1bd0e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-16 16:17:54 -07:00
Brian Behlendorf
3eb4ba3ebd
Add 3 more uninit errors detected by gcc 3.4.0 compiler.
2009-03-16 16:06:50 -07:00
Brian Behlendorf
9d19cb6390
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-16 10:40:36 -07:00
Brian Behlendorf
be112b3f57
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 10:30:31 -07:00
Brian Behlendorf
5ee8a85ba6
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-16 10:30:27 -07:00
Brian Behlendorf
9818e69640
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-03-16 10:12:01 -07:00
Brian Behlendorf
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
Brian Behlendorf
e892c29158
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 15:45:56 -07:00
Brian Behlendorf
82ce8b00f3
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:44:14 -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
13e1e9584c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 15:27:51 -07:00
Brian Behlendorf
379d9cf34d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:26:15 -07:00
Brian Behlendorf
6a59551cb7
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-12 15:26:13 -07:00
Brian Behlendorf
c4e10eb3df
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-03-12 15:21:30 -07:00
Brian Behlendorf
f1f9c50dd9
Add fix-strncat branch which corrects a buffer overrun.
2009-03-12 15:20:26 -07:00
Brian Behlendorf
2b38abcd29
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 15:14:01 -07:00
Brian Behlendorf
f2e7d57653
Packaging update
...
Make LINUX_VERSION available to Makefile's, add packaging
for user space include headers.
2009-03-12 15:07:29 -07:00
Brian Behlendorf
e0b048a823
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 10:39:17 -07:00
Brian Behlendorf
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -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
2a002fd082
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 10:01:56 -07:00
Brian Behlendorf
dd30dba016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:00:04 -07:00
Brian Behlendorf
193ea156e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:00:03 -07:00
Brian Behlendorf
eceaf813ad
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-03-12 10:00:01 -07:00
Brian Behlendorf
f2d72af596
Add remaining missing cases (or a default) to all switch statements.
...
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements. The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
2009-03-12 09:53:08 -07:00
Brian Behlendorf
8d06511a29
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 21:01:35 -07:00
Brian Behlendorf
4c042de40b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 20:59:43 -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
1d544f4131
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 14:11:31 -07:00
Brian Behlendorf
1ca6578ebc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 14:08:51 -07:00
Brian Behlendorf
8a3b1a5ff5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 14:08:50 -07:00
Brian Behlendorf
e5011401cd
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-03-11 14:08:48 -07:00
Brian Behlendorf
3226eea157
Resolve additional cases where gcc wants extra parenthesis.
...
These were introduced by the rebase to b108.
2009-03-11 13:57:47 -07:00
Brian Behlendorf
0eca278f8a
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 11:18:37 -07:00
Brian Behlendorf
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
Brian Behlendorf
5f30a3cb0e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 11:09:11 -07:00
Brian Behlendorf
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
Ricardo M. Correia
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
Brian Behlendorf
370b674e09
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-10 21:27:49 -07:00
Brian Behlendorf
c8e569dd1c
Build system and packaging (RPM support) (Part 2)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:13:30 -07:00
Brian Behlendorf
e47dcbd2d7
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-02-18 15:22:12 -08:00
Brian Behlendorf
830ac5b109
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 15:20:11 -08:00
Brian Behlendorf
6f8f3b5532
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 15:20:10 -08:00
Brian Behlendorf
9d4d22a26e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 15:20:08 -08:00
Brian Behlendorf
8c228734a3
Fix cast
2009-02-18 15:15:56 -08:00
Brian Behlendorf
d9229ad643
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-02-18 14:35:32 -08:00
Brian Behlendorf
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -08:00
Brian Behlendorf
15f5ddebdf
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
...
Conflicts:
lib/libzpool/kernel.c
2009-02-18 14:29:08 -08:00
Brian Behlendorf
109a1d5b16
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-02-18 14:28:38 -08:00
Brian Behlendorf
6fe19bd252
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:28:15 -08:00
Brian Behlendorf
f0a8aedfbc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:27:12 -08:00
Brian Behlendorf
3eb7fa9afd
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-02-18 14:04:08 -08:00
Brian Behlendorf
5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
Brian Behlendorf
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
Brian Behlendorf
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -08:00
Brian Behlendorf
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
Brian Behlendorf
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
Brian Behlendorf
3b17164f71
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
2009-02-18 13:09:32 -08:00
Brian Behlendorf
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
Brian Behlendorf
7c5b7d2a94
This should always be success when zvol support is disabled
2009-01-16 14:52:35 -08:00
Brian Behlendorf
476261f2d5
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-15 14:21:18 -08:00
Brian Behlendorf
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
Brian Behlendorf
a42707fcc0
Resolve conflict with removed cleaner type
2009-01-15 14:16:03 -08:00
Brian Behlendorf
48a55a0a10
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-01-15 14:13:54 -08:00
Brian Behlendorf
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
Brian Behlendorf
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
Brian Behlendorf
7b54fe44dc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-15 14:05:38 -08:00
Brian Behlendorf
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
Brian Behlendorf
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
Brian Behlendorf
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -08:00