760c0c3629
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 15:53:44 -07:00
24d1a8e0ed
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:53:43 -07:00
06b5dc883f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 15:51:52 -07:00
953aa00176
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 15:51:51 -07:00
3700f9d20b
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-14 15:51:50 -07:00
5fa2cb516b
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-06-14 15:51:50 -07:00
c430e23552
Update zfs-branch with build system updates
...
Required Makefile modifications for updated ZFS code.
2010-06-14 15:46:11 -07:00
ea78161e40
Update META to version 0.5.0
2010-06-14 15:45:23 -07:00
696ec7fb61
Update gcc-missing-braces based on structure changes
...
Almost exclusively this patch handled the addition of another char
array to the zfs_cmd_t structure. Unfortunately c90 doesn't allow
zero filling the entire struct with the '= { 0 };' shorthand.
2010-06-14 15:44:06 -07:00
9953f52bec
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 15:39:05 -07:00
12fac2aa2c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:39:03 -07:00
7eadc495c6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 15:37:05 -07:00
b5ba75f385
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 15:37:03 -07:00
7022cf22c3
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-14 15:37:02 -07:00
dfe881c0ef
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-06-14 15:37:01 -07:00
1e7a75049a
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-14 15:37:00 -07:00
c8d75a1c9d
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-06-14 15:37:00 -07:00
d9f910d423
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
993fa8c15c
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
2c95012288
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-06-14 15:36:59 -07:00
3135b5a26a
Update gcc-c90 minor updates
...
Originally these changes were on other gcc-* topic branches but
because c90 touches the same bit of code and I'd like to keep all
the gcc-* branches completely parallel I've moved these few bits
over here. This is one of the downsides of not just having one
big patch stack.
2010-06-14 15:32:54 -07:00
d8e123dc27
Update gcc-unused
...
Fix new instances or changes in gcc flagged unused code. These are
mostly related to variables which are not used when debugging is
disabled and the ASSERTs are compiled out.
2010-06-14 15:29:48 -07:00
b41463f5e8
Update gcc-invalid-prototypes
...
Fix new invalid prototypes, typically just a missing void arg.
2010-06-14 15:25:49 -07:00
b320a7bb4b
Update gcc-unit
...
Fix new possibly uninitialized variables according to gcc.
2010-06-14 15:24:20 -07:00
0a8593375e
Update gcc-missing-case
...
Fix new locations of an incomplete case statement.
2010-06-14 15:19:09 -07:00
1893aa76ec
Update gcc-no-parenthesis
...
Fix new locations of missing parenthesis according to gcc.
2010-06-14 15:16:41 -07:00
48bd88f014
Update gcc-c90
...
Additional c90 fixes required due to ZFS update, these include fixing new
places c99 specific things have been done and some cleanup of old usage.
2010-06-14 15:15:26 -07:00
c943bd62d4
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 14:44:43 -07:00
a53a9b9e9d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 14:44:42 -07:00
bdf5763c0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 14:42:58 -07:00
9f9a451561
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 14:42:57 -07:00
622a3249a1
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-14 14:42:57 -07:00
fc490c18b6
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-06-14 14:42:56 -07:00
dd8f6da3da
Update gcc-cast
...
Fix new instances of missing casts or assumed types.
2010-06-14 14:40:10 -07:00
82b9a38cdb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-28 16:01:54 -07:00
97c49607ec
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dmu_objset.c
module/zfs/dmu_tx.c
module/zfs/dsl_dataset.c
module/zfs/dsl_dir.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/spa_misc.c
module/zfs/vdev.c
module/zfs/zil.c
module/zfs/zio.c
2010-05-28 16:01:35 -07:00
812761eac5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-28 15:46:10 -07:00
9fa832ed93
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 15:45:43 -07:00
e27754d9e8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
module/zfs/spa_history.c
2010-05-28 15:45:38 -07:00
06a45ce57e
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-05-28 15:39:13 -07:00
6538095cdd
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-05-28 15:39:12 -07:00
06ba6dc528
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
...
Conflicts:
lib/libzfs/libzfs_pool.c
2010-05-28 15:39:07 -07:00
0b0deba9fc
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-05-28 15:38:49 -07:00
547c06e594
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-05-28 15:38:49 -07:00
ffaa677995
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
2010-05-28 15:38:43 -07:00
408ad63b2f
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-05-28 15:38:11 -07:00
6fc05373e6
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-05-28 15:38:11 -07:00
3ac26c7efb
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-05-28 15:38:11 -07:00
d8f9623833
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb_il.c
2010-05-28 15:38:05 -07:00
0df35b3599
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-05-28 15:37:36 -07:00
Brian Behlendorf