36c46c6031
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-13 10:57:45 -07:00
d2910d2415
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-13 10:57:43 -07:00
c98996ded8
Explicitly cast to prevent 'void *' dereference.
2009-03-13 10:51:11 -07:00
b625eab814
Move upcall after run_args are initialized.
2009-03-12 10:46:54 -07:00
58e63ca4cc
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:40:17 -07:00
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -07:00
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
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
308903afa4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:02:53 -07:00
dd30dba016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:00:04 -07:00
193ea156e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:00:03 -07:00
eceaf813ad
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-03-12 10:00:01 -07:00
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
ef003a41c3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 22:50:02 -07:00
909582a95e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 22:47:56 -07:00
6211d1a370
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 22:47:54 -07:00
a2dc88da2a
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-03-11 22:47:53 -07:00
462f864365
Check should be in ASSERT to minimize stack and prevent unused var.
2009-03-11 22:38:16 -07:00
01c24c3a86
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 22:29:57 -07:00
e625efa701
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 22:27:15 -07:00
c9daa4fbd2
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 22:27:14 -07:00
246cae3509
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-11 22:27:11 -07:00
ecd2dbcb44
Resolve upstream unused variables so we can remove the -Wno-unused
...
compile option. In most case the variables are only unused when
debugging is disabled (ASSERT) however they do waste stack if that
case if the compiler doesn't optimize it out (it should). But more
importantly disabling this warning prevent us from noticing legit
unused variables accidentally left in other place of the code.
2009-03-11 22:07:25 -07:00
9326966d34
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 21:02:37 -07:00
4c042de40b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 20:59:43 -07:00
60ac8152fe
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 20:59:42 -07:00
9915249546
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-03-11 20:53:11 -07:00
d4dbc7dca8
Resolve all instances of missing braces.
2009-03-11 20:52:21 -07:00
bd92e256e6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 14:12:52 -07:00
1ca6578ebc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 14:08:51 -07:00
8a3b1a5ff5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 14:08:50 -07:00
e5011401cd
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-03-11 14:08:48 -07:00
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
94caad0d1f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 13:27:22 -07:00
4e945fb768
Remove -Wno-unknown-pragmas compile option, all unknown pragmas
...
have been removed by the gcc-ident-pragmas topic branch.
2009-03-11 13:14:08 -07:00
b56b3ef9b9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 12:47:26 -07:00
0cad1eaf40
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 12:43:30 -07:00
86baaa124e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 12:43:29 -07:00
ced9992186
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-11 12:43:28 -07:00
fbb2843086
Ensure idx is properly initialized in all instances.
2009-03-11 12:34:24 -07:00
a55824aa6a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 11:20:15 -07:00
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
5f30a3cb0e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 11:09:11 -07:00
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
2d756b5ea3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 10:44:10 -07:00
8eaf19dae8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 10:40:33 -07:00
d43e9ca262
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 10:40:31 -07:00
d641369d38
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-03-11 10:32:45 -07:00
fd9a7a0fb4
Add 'ull' suffix to 64-bit constants.
2009-03-11 10:31:24 -07:00
c0c0c27632
Build system and packaging (RPM support) (Part 3)
...
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:45:50 -07:00
7f0ca09791
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-10 21:42:00 -07:00
4911b7be4d
zpios subdir should be on linux-zpios branch
2009-03-10 21:33:24 -07:00
6bf18caf9f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
module/Makefile.in
2009-03-10 21:29:58 -07:00
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
4d28f29b6c
Update profile scripts with additional upcalls for fine grained profiling
2009-02-20 14:28:00 -08:00
d51fcd107f
Remove useless run_args->regions check which was always true
2009-02-19 14:35:41 -08:00
23710f1308
Minor zpios cleanup plus addition of --nowait feature
2009-02-19 12:56:50 -08:00
a2b17c5744
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-18 16:39:57 -08:00
b57a283336
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 16:36:19 -08:00
d53b9a34ea
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 16:36:17 -08:00
e6c50e7136
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-02-18 16:36:16 -08:00
a0ef7f5826
C90 fixes int declared in for() is a C99 construct
2009-02-18 16:30:01 -08:00
ccdc0e2d04
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-18 16:24:06 -08:00
6c4c486b9e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 16:20:33 -08:00
c1d525d6e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 16:20:32 -08:00
fd9fdb78c6
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 16:20:30 -08:00
f07954ef8a
Pass 0's instead of NULL's which are the same but of the correct type
2009-02-18 16:14:20 -08:00
eb3d5e7051
Local try should be in this patch
2009-02-18 14:47:06 -08:00
b3d7657ea0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-18 14:37:01 -08:00
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -08:00
87307ab12a
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-02-18 14:30:48 -08:00
dbc3a5ec55
Merge commit 'refs/top-bases/fix-list' into fix-list
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:29:48 -08:00
404fd8578f
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-02-18 14:28:27 -08:00
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
3ac1fca8dc
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-02-18 14:27:31 -08:00
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
32d4d74b04
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-02-18 14:04:04 -08:00
6fa66816c1
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:55 -08:00
5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -08:00
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
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
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
7c8ca1d516
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 16:34:13 -08:00
fb256294c9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 16:30:29 -08:00
c5b335f613
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-15 16:30:28 -08:00
31cddc8a0b
Merge branch 'fix-locks' into refs/top-bases/fix-branch
2009-01-15 16:30:25 -08:00
50186c2b57
All init and destroy initialized pulled in
2009-01-15 16:25:25 -08:00
7d4fe54632
txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions
2009-01-15 16:22:23 -08:00
50a6b919a4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 15:30:46 -08:00
8511545409
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 15:29:15 -08:00
fa36244fba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 15:29:14 -08:00
4c0be07ad9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 15:29:13 -08:00
22284754e0
Resolve C90 int declared in for() construct
2009-01-15 15:26:54 -08:00
b8709a7d90
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 14:53:41 -08:00
63722ea81a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:52:04 -08:00
12fb73609c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:52:04 -08:00
e23dbee181
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:52:03 -08:00
b61295bfb6
Resolve C90 int declared in for() construct
2009-01-15 14:49:42 -08:00
6479dc1921
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 14:40:07 -08:00
3b6c91ec9f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:38:38 -08:00
ec41b57eb3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:38:38 -08:00
e9c7a643f1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:38:37 -08:00
77f365172c
Resolve C90 int declared in for() construct
2009-01-15 14:36:27 -08:00
94c2ebf6f0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 14:30:40 -08:00
cb55f9a832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:29:11 -08:00
43b4c537eb
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:29:10 -08:00
f969333c73
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:29:09 -08:00
c4fc002c87
Resolve C90 int declared in for() construct
2009-01-15 14:26:52 -08:00
de66052064
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-15 14:21:55 -08:00
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
27cf20b0d6
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-15 14:16:19 -08:00
625451acfc
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-01-15 14:16:14 -08:00
089836c3e4
Resolve conflict with removed cleaner type
2009-01-15 14:14:57 -08:00
216ce72418
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-15 14:13:46 -08:00
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
b633e4f669
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-15 14:11:26 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
7aa64936aa
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-01-15 14:05:35 -08:00
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -08:00
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
1194e0412f
Change all instances of kpios to zpios
2009-01-14 08:38:35 -08:00
9ab30b2e96
Use zpios not kpios for referce
2009-01-13 16:42:21 -08:00
7635d14cd1
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-13 16:09:27 -08:00
04d7ae5f22
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 16:06:28 -08:00
c186f81c6d
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 16:06:26 -08:00
e1632568f1
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 16:06:23 -08:00
be0b4029db
Initialize list links
2009-01-13 16:02:19 -08:00
5ae7f2d447
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-13 15:35:25 -08:00
32baeb1712
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:34:01 -08:00
0d6b81fcca
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:34:00 -08:00
43cd437415
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 15:33:59 -08:00
94944fab96
Fix proper list node initialization
2009-01-13 15:31:58 -08:00
5ddcc115b3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-13 15:08:32 -08:00
b14513e826
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:07:08 -08:00
4c31283afc
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:07:07 -08:00
2e9cd667d0
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-01-13 15:07:06 -08:00
fcd2296399
Additional rw_lock not being initialized cleaned in updated code
2009-01-13 15:05:02 -08:00
ff35f88f33
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-13 15:03:36 -08:00
60f5ac8ac7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:02:12 -08:00
4a5bd7a3a8
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:02:11 -08:00
Brian Behlendorf
Ricardo M. Correia