Brian Behlendorf
246cae3509
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-11 22:27:11 -07:00
Brian Behlendorf
25c88fda18
Remove unused variable
2009-03-11 22:15:36 -07:00
Brian Behlendorf
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
Brian Behlendorf
b4ab230f6a
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 21:01:45 -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
f6fe1c9ee9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 14:11:44 -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
0d1f924c2d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 13:26:21 -07:00
Brian Behlendorf
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
Brian Behlendorf
a6faa4a39d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 12:46:19 -07:00
Brian Behlendorf
0cad1eaf40
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 12:43:30 -07:00
Brian Behlendorf
86baaa124e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 12:43:29 -07:00
Brian Behlendorf
ced9992186
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-11 12:43:28 -07:00
Brian Behlendorf
fbb2843086
Ensure idx is properly initialized in all instances.
2009-03-11 12:34:24 -07:00
Brian Behlendorf
fbe3b02667
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 11:18:54 -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
4f57a6ccb6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 10:43:09 -07:00
Brian Behlendorf
8eaf19dae8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 10:40:33 -07:00
Brian Behlendorf
d43e9ca262
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 10:40:31 -07:00
Brian Behlendorf
d641369d38
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-03-11 10:32:45 -07:00
Ricardo M. Correia
fd9a7a0fb4
Add 'ull' suffix to 64-bit constants.
2009-03-11 10:31:24 -07:00
Brian Behlendorf
f48c3c25ea
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-10 21:41:06 -07:00
Brian Behlendorf
4911b7be4d
zpios subdir should be on linux-zpios branch
2009-03-10 21:33:24 -07:00
Brian Behlendorf
be8904440b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-10 21:28:01 -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
a21e67a4af
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-02-18 16:38:54 -08:00
Brian Behlendorf
b57a283336
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 16:36:19 -08:00
Brian Behlendorf
d53b9a34ea
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 16:36:17 -08:00
Brian Behlendorf
e6c50e7136
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-02-18 16:36:16 -08:00
Brian Behlendorf
a0ef7f5826
C90 fixes int declared in for() is a C99 construct
2009-02-18 16:30:01 -08:00
Brian Behlendorf
4df2e94a2d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-02-18 16:23:03 -08:00
Brian Behlendorf
6c4c486b9e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 16:20:33 -08:00
Brian Behlendorf
c1d525d6e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 16:20:32 -08:00
Brian Behlendorf
fd9fdb78c6
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 16:20:30 -08:00
Brian Behlendorf
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
Brian Behlendorf
eb3d5e7051
Local try should be in this patch
2009-02-18 14:47:06 -08:00
Brian Behlendorf
3d4185ed1d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-02-18 14:35:43 -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
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
Brian Behlendorf
dbc3a5ec55
Merge commit 'refs/top-bases/fix-list' into fix-list
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:29:48 -08:00
Brian Behlendorf
3ef12f42a2
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-02-18 14:29:23 -08:00
Brian Behlendorf
7fe1b71533
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-02-18 14:29:19 -08:00
Brian Behlendorf
d6e8154947
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-02-18 14:28:30 -08:00
Brian Behlendorf
404fd8578f
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-02-18 14:28:27 -08:00
Brian Behlendorf
d190a5b9bd
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-02-18 14:28:23 -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
3ac1fca8dc
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-02-18 14:27:31 -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
32d4d74b04
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-02-18 14:04:04 -08:00
Brian Behlendorf
6fa66816c1
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:55 -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
fc8954db24
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-02-18 13:12:48 -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
3657ada547
Update linux vdev_disk interfaces to issue multiple bios if needed due to the maximum request size being smaller than the request size passed down from the spa
2009-01-26 16:46:50 -08:00
Brian Behlendorf
ab8f4ca43f
Convert ASSERT() to VERIFY() for better coverage
2009-01-21 10:59:06 -08:00
Brian Behlendorf
8ff964a4f3
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 16:33:09 -08:00
Brian Behlendorf
fb256294c9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 16:30:29 -08:00
Brian Behlendorf
c5b335f613
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-15 16:30:28 -08:00
Brian Behlendorf
31cddc8a0b
Merge branch 'fix-locks' into refs/top-bases/fix-branch
2009-01-15 16:30:25 -08:00
Brian Behlendorf
50186c2b57
All init and destroy initialized pulled in
2009-01-15 16:25:25 -08:00
Brian Behlendorf
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
Brian Behlendorf
461fe17e5f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 15:30:20 -08:00
Brian Behlendorf
8511545409
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 15:29:15 -08:00
Brian Behlendorf
fa36244fba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 15:29:14 -08:00
Brian Behlendorf
4c0be07ad9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 15:29:13 -08:00
Brian Behlendorf
22284754e0
Resolve C90 int declared in for() construct
2009-01-15 15:26:54 -08:00
Brian Behlendorf
41c372fa3f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 14:53:14 -08:00
Brian Behlendorf
63722ea81a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:52:04 -08:00
Brian Behlendorf
12fb73609c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:52:04 -08:00
Brian Behlendorf
e23dbee181
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:52:03 -08:00
Brian Behlendorf
b61295bfb6
Resolve C90 int declared in for() construct
2009-01-15 14:49:42 -08:00
Brian Behlendorf
a74bc899dc
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 14:39:42 -08:00
Brian Behlendorf
3b6c91ec9f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:38:38 -08:00
Brian Behlendorf
ec41b57eb3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:38:38 -08:00
Brian Behlendorf
e9c7a643f1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:38:37 -08:00
Brian Behlendorf
77f365172c
Resolve C90 int declared in for() construct
2009-01-15 14:36:27 -08:00
Brian Behlendorf
7dd685ccc3
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 14:30:14 -08:00
Brian Behlendorf
cb55f9a832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:29:11 -08:00
Brian Behlendorf
43b4c537eb
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 14:29:10 -08:00
Brian Behlendorf
f969333c73
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 14:29:09 -08:00
Brian Behlendorf
c4fc002c87
Resolve C90 int declared in for() construct
2009-01-15 14:26:52 -08:00
Brian Behlendorf
465b2c795d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-15 14:21:24 -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
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
Brian Behlendorf
625451acfc
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-01-15 14:16:14 -08:00
Brian Behlendorf
b5409ba1e2
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-01-15 14:16:12 -08:00
Brian Behlendorf
1d3ce40c2e
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-01-15 14:16:09 -08:00
Brian Behlendorf
089836c3e4
Resolve conflict with removed cleaner type
2009-01-15 14:14:57 -08:00
Brian Behlendorf
a378243d07
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-01-15 14:13:49 -08:00
Brian Behlendorf
216ce72418
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-15 14:13:46 -08:00
Brian Behlendorf
2e35cc0802
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-01-15 14:13:43 -08:00
Brian Behlendorf
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
Brian Behlendorf
b633e4f669
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-15 14:11:26 -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
7aa64936aa
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-01-15 14:05:35 -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
Brian Behlendorf
86e39f5e3b
Resolve conflict with removed cleaner type
2009-01-15 14:05:21 -08:00
Brian Behlendorf
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
Brian Behlendorf
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
Brian Behlendorf
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00
Brian Behlendorf
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
Brian Behlendorf
2dac6d5542
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-13 16:08:32 -08:00
Brian Behlendorf
04d7ae5f22
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 16:06:28 -08:00
Brian Behlendorf
c186f81c6d
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 16:06:26 -08:00
Brian Behlendorf
e1632568f1
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 16:06:23 -08:00
Brian Behlendorf
be0b4029db
Initialize list links
2009-01-13 16:02:19 -08:00
Brian Behlendorf
95db697cc4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-13 15:35:01 -08:00
Brian Behlendorf
32baeb1712
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:34:01 -08:00
Brian Behlendorf
0d6b81fcca
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:34:00 -08:00
Brian Behlendorf
43cd437415
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 15:33:59 -08:00
Brian Behlendorf
94944fab96
Fix proper list node initialization
2009-01-13 15:31:58 -08:00
Brian Behlendorf
de43f9a57c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-13 15:08:08 -08:00
Brian Behlendorf
b14513e826
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:07:08 -08:00
Brian Behlendorf
4c31283afc
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:07:07 -08:00
Brian Behlendorf
2e9cd667d0
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-01-13 15:07:06 -08:00
Brian Behlendorf
fcd2296399
Additional rw_lock not being initialized cleaned in updated code
2009-01-13 15:05:02 -08:00
Brian Behlendorf
e095be1cc5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-13 15:03:12 -08:00
Brian Behlendorf
60f5ac8ac7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 15:02:12 -08:00
Brian Behlendorf
4a5bd7a3a8
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 15:02:11 -08:00
Brian Behlendorf
6c96fc31e9
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 15:02:10 -08:00
Brian Behlendorf
bec036636e
List cleanup and use of list_node_init initializer
2009-01-13 15:00:12 -08:00
Brian Behlendorf
4ef8421b03
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-13 14:19:13 -08:00
Brian Behlendorf
bdb0ce1a0d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 14:18:11 -08:00
Brian Behlendorf
552c9e1abb
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-13 14:18:10 -08:00
Brian Behlendorf
c6f1eca44b
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-13 14:18:09 -08:00
Brian Behlendorf
2ea04834bf
Remove assertion for now
2009-01-13 14:16:11 -08:00
Brian Behlendorf
323f4f67dd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-13 13:33:31 -08:00
Brian Behlendorf
f8b66dcc4f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-13 13:32:31 -08:00
Brian Behlendorf
8ad629750e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-13 13:32:30 -08:00
Brian Behlendorf
bb9b10a830
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-13 13:32:29 -08:00
Brian Behlendorf
b73b29ab8e
Fix c90 issue with { }
2009-01-13 13:30:35 -08:00
Brian Behlendorf
d7e52cccea
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 14:46:05 -08:00
Brian Behlendorf
ff09d64647
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
2009-01-09 14:37:45 -08:00
Brian Behlendorf
ccb1f1c5d4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 14:18:47 -08:00
Brian Behlendorf
6b32aaea67
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 14:17:49 -08:00
Brian Behlendorf
86eb46d20b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 14:17:49 -08:00
Brian Behlendorf
578c9645df
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-09 14:17:48 -08:00
Brian Behlendorf
902ce659b0
Fix c90 compliance issue
2009-01-09 14:15:56 -08:00
Brian Behlendorf
b881b78bc9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 13:34:10 -08:00
Brian Behlendorf
7a7a074d3d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 13:33:11 -08:00
Brian Behlendorf
cd5e331e68
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 13:33:10 -08:00
Brian Behlendorf
953d302b87
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-01-09 13:33:09 -08:00
Brian Behlendorf
04638ead67
Change zpool module name to zfs and update references
2009-01-09 13:31:16 -08:00
Brian Behlendorf
ca4fc6ef63
Fix cast
2009-01-09 13:29:41 -08:00
Brian Behlendorf
613eaeb74b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 12:49:14 -08:00
Brian Behlendorf
129afe3ce8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-09 12:46:44 -08:00
Brian Behlendorf
b4d27767d8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-09 12:46:42 -08:00
Brian Behlendorf
b3064162aa
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-01-09 12:46:40 -08:00
Brian Behlendorf
cb5fc9440b
Remove extra defaults
2009-01-09 12:42:27 -08:00
Brian Behlendorf
8cd72da031
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-09 09:22:49 -08:00
Brian Behlendorf
91b9bf3f40
Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues
2009-01-09 09:19:33 -08:00
Brian Behlendorf
b38c50ac45
Update vdev_disk.c implementation to be compatible with b103 API
2009-01-08 10:25:23 -08:00
Brian Behlendorf
4faa6ff9df
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-07 15:52:56 -08:00
Brian Behlendorf
2a76f03369
Update distfiles
2009-01-07 15:49:36 -08:00
Brian Behlendorf
d3b387c40c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-06 13:46:22 -08:00
Brian Behlendorf
6280843d13
Remove until it can be updated
2009-01-06 13:43:53 -08:00
Brian Behlendorf
bf0e564947
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-06 13:17:02 -08:00
Brian Behlendorf
f9494f2bb1
Build missing sources
2009-01-06 13:14:30 -08:00
Brian Behlendorf
37555b8fe3
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-06 09:30:49 -08:00
Brian Behlendorf
5f9b0590f5
Remove zfs_fuid for now from kernel source until needed by ZPL
2009-01-06 09:28:09 -08:00
Brian Behlendorf
4522c570e8
Add missing prototype
2009-01-06 08:39:45 -08:00
Brian Behlendorf
3a1f0dcde1
Refresh prototype due to upstream changes
2009-01-05 16:53:23 -08:00
Brian Behlendorf
ef1c43e66f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 16:40:14 -08:00
Brian Behlendorf
9d4d588938
Comment out until ZPL implemented
2009-01-05 16:34:01 -08:00
Brian Behlendorf
bb747a10de
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 15:45:25 -08:00
Brian Behlendorf
760d78b9f8
Move default include paths after custom include paths so local stuff gets picked up first
2009-01-05 15:42:56 -08:00
Brian Behlendorf
a1dc943c32
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 14:28:53 -08:00
Brian Behlendorf
a4ecacdad7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 14:28:00 -08:00
Brian Behlendorf
93e72d1102
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 14:27:59 -08:00
Brian Behlendorf
854fda6d70
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-01-05 14:27:58 -08:00
Brian Behlendorf
12ee6d57c8
Avoid using { 0 } assignment because it assume certain things about the condvar and mutex typedefs which may not be true
2009-01-05 14:26:16 -08:00
Brian Behlendorf
144eca0e84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 12:41:04 -08:00
Brian Behlendorf
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
Brian Behlendorf
ced77c2f1b
Add unicode makefile references and support
2009-01-05 12:32:55 -08:00
Brian Behlendorf
bde3267f84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-05 12:11:36 -08:00
Brian Behlendorf
07c6176130
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-05 12:09:06 -08:00
Brian Behlendorf
52bc9eee2b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-05 12:09:00 -08:00
Brian Behlendorf
5e814ba757
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-01-05 12:08:53 -08:00
Brian Behlendorf
9e12900ee7
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-01-05 12:08:50 -08:00
Brian Behlendorf
c239bd53d2
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-05 12:08:46 -08:00
Brian Behlendorf
65520ad8fd
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2009-01-05 12:08:36 -08:00
Brian Behlendorf
c849b165ec
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-01-05 12:08:26 -08:00
Brian Behlendorf
1bee6d83ae
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-05 12:08:23 -08:00
Brian Behlendorf
491e2d036a
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-01-05 12:08:20 -08:00
Brian Behlendorf
674ed5bd02
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-01-05 12:08:18 -08:00
Brian Behlendorf
91daa17079
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-05 12:08:16 -08:00
Brian Behlendorf
39b3a6a12d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-05 12:08:11 -08:00
Brian Behlendorf
600c6efdab
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-05 12:08:07 -08:00
Brian Behlendorf
358ebaae5a
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-01-05 12:08:02 -08:00
Brian Behlendorf
a22f3a712d
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-05 12:07:58 -08:00
Brian Behlendorf
a55b0f2c1b
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-05 12:07:53 -08:00
Brian Behlendorf
d09ef994e7
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-05 12:07:48 -08:00
Brian Behlendorf
f51763c688
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-01-05 12:07:44 -08:00
Brian Behlendorf
5a7a00f67c
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-05 12:07:30 -08:00
Brian Behlendorf
7d4ccef58f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-05 12:07:27 -08:00
Brian Behlendorf
cdfd10ba79
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-05 12:07:25 -08:00
Brian Behlendorf
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
Brian Behlendorf
6f596265c6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 13:50:08 -08:00
Brian Behlendorf
de6b729e33
Add Makefile tweak
2008-12-23 13:44:15 -08:00
Brian Behlendorf
c2f93a61e2
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 13:13:51 -08:00
Brian Behlendorf
e7e0111a7c
Update makefile
2008-12-23 13:07:27 -08:00
Brian Behlendorf
971e4cca83
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 12:51:21 -08:00
Brian Behlendorf
0dfd5ebee8
module/zcommon/Makefile.in
2008-12-23 12:47:03 -08:00
Brian Behlendorf
4f98a245f4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-23 11:50:19 -08:00
Brian Behlendorf
5a0a9cc451
Update makefiles
2008-12-23 11:47:33 -08:00
Brian Behlendorf
ddb72e5a3d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-22 13:52:21 -08:00
Brian Behlendorf
90e5216ea9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 13:51:17 -08:00
Brian Behlendorf
3b93dc4d82
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 13:51:14 -08:00
Brian Behlendorf
3a953fa870
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2008-12-22 13:51:13 -08:00
Brian Behlendorf
d684390d3a
Just fix a bogus return type
2008-12-22 13:49:15 -08:00
Brian Behlendorf
b17c1f4123
Don't make this fatal for userspace
2008-12-22 13:32:19 -08:00
Brian Behlendorf
52a84a3394
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-22 11:41:54 -08:00
Brian Behlendorf
7047bb0678
Add missing files from Makefile.am
2008-12-22 11:36:48 -08:00
Brian Behlendorf
8126ebe55f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-22 10:37:14 -08:00
Brian Behlendorf
10911f9d71
Add missing sources
2008-12-22 10:27:41 -08:00
Brian Behlendorf
15e778a05c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 16:35:07 -08:00
Brian Behlendorf
96813619bf
Pull in new background scrubber
2008-12-19 16:29:13 -08:00
Brian Behlendorf
3aa09f9e0d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 13:48:18 -08:00
Brian Behlendorf
1b2a1a31bb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 13:47:20 -08:00
Brian Behlendorf
b5e4bf3731
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 13:47:19 -08:00
Brian Behlendorf
8161b781a1
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 13:47:18 -08:00
Brian Behlendorf
89bd2100e7
Resolve a few more c90 issues
2008-12-19 13:45:24 -08:00
Brian Behlendorf
add6c31eed
Update vdev_disk for in-kernel use
2008-12-19 13:34:38 -08:00
Brian Behlendorf
385cabaff9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 12:39:11 -08:00
Brian Behlendorf
97818e5e2b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 12:37:17 -08:00
Brian Behlendorf
459f1388ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 12:37:15 -08:00
Brian Behlendorf
87810a7c8b
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 12:37:13 -08:00
Brian Behlendorf
93a6c0b0b9
Fix c90 for() issue
2008-12-19 12:33:22 -08:00
Brian Behlendorf
a8e7c21ad7
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 11:06:51 -08:00
Brian Behlendorf
cc92d6497b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 11:05:49 -08:00
Brian Behlendorf
d67cf69e08
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 11:05:49 -08:00
Brian Behlendorf
893a49fa9a
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 11:05:48 -08:00
Brian Behlendorf
9041f66bad
Fix all instances of for (int i;;) {} that were easily found
2008-12-19 11:03:54 -08:00
Brian Behlendorf
0938ee26f9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:51:08 -08:00
Brian Behlendorf
1db27e736e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:50:09 -08:00
Brian Behlendorf
ead0ea6da5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:50:09 -08:00
Brian Behlendorf
d9b08ad01f
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:50:08 -08:00
Brian Behlendorf
66e0d59024
Whoops, add missing j
2008-12-19 10:48:11 -08:00
Brian Behlendorf
023d652154
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:37:31 -08:00
Brian Behlendorf
76247cc21d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:36:34 -08:00
Brian Behlendorf
800463b2ef
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:36:33 -08:00
Brian Behlendorf
7e159c86a3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-19 10:36:32 -08:00
Brian Behlendorf
294ebb7537
Fix C90 for(int i;;;) compliance issues
2008-12-19 10:34:41 -08:00
Brian Behlendorf
27f8780a37
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-19 10:27:14 -08:00
Brian Behlendorf
e3815b6d3f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 10:26:18 -08:00
Brian Behlendorf
e312737766
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-19 10:26:18 -08:00
Brian Behlendorf
b66929fe90
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-19 10:26:17 -08:00
Brian Behlendorf
5ee6377759
Fix missing void in prototype
2008-12-19 10:24:26 -08:00
Brian Behlendorf
63f8023d96
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:53:30 -08:00
Brian Behlendorf
433b5c8023
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:52:17 -08:00
Brian Behlendorf
93bc33a39e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:52:16 -08:00
Brian Behlendorf
23e30eeec9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:52:15 -08:00
Brian Behlendorf
6cccf01d35
Missed needed drc var
2008-12-18 13:50:12 -08:00
Brian Behlendorf
5200db236f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:44:26 -08:00
Brian Behlendorf
bab7f42832
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:43:20 -08:00
Brian Behlendorf
5ce7826ab4
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:43:19 -08:00
Brian Behlendorf
732fe6a75f
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:43:19 -08:00
Brian Behlendorf
973a9d5a79
Resolve drr shadow by breaking hunk in to a new function, which is just cleaner anyway
2008-12-18 13:41:21 -08:00
Brian Behlendorf
651f0337c4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 13:27:42 -08:00
Brian Behlendorf
1a6091791d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 13:26:36 -08:00
Brian Behlendorf
8f52e45adf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 13:26:35 -08:00
Brian Behlendorf
8eccbd95b9
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 13:26:34 -08:00
Brian Behlendorf
163f096cb6
Resolve remove shadow, rename to rm
2008-12-18 13:24:37 -08:00
Brian Behlendorf
b7bc2d2d19
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:52:32 -08:00
Brian Behlendorf
4be8cdca38
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:51:24 -08:00
Brian Behlendorf
cf4b3895f1
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:51:23 -08:00
Brian Behlendorf
458a2444c2
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:51:22 -08:00
Brian Behlendorf
d957a6c66f
Resolve dnp shadow conflict
2008-12-18 11:49:22 -08:00
Brian Behlendorf
caac73b67d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:39:34 -08:00
Brian Behlendorf
58645698b4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:34:26 -08:00
Brian Behlendorf
9ae2c70438
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 11:34:25 -08:00
Brian Behlendorf
625fac6664
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 11:34:24 -08:00
Brian Behlendorf
63bf9b60d5
Revert changes from this branch so the branch may be removed. We
...
will integrate the latest patch from Sun here once everything is
is basically working. This verion of the patch is out of date
anyone and may not be what is needed.
2008-12-18 11:31:32 -08:00
Brian Behlendorf
bf5db00d71
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 11:25:49 -08:00
Brian Behlendorf
2ef6ae9654
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 11:24:42 -08:00
Brian Behlendorf
d431498139
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 11:24:41 -08:00
Brian Behlendorf
22f122e505
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 11:24:40 -08:00
Brian Behlendorf
50b70a0c9a
Resolve time conflict
2008-12-18 11:22:39 -08:00
Brian Behlendorf
b2c4e56a4f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 10:07:06 -08:00
Brian Behlendorf
5c7ee1347b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 10:06:01 -08:00
Brian Behlendorf
012ce813df
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2008-12-18 10:06:00 -08:00
Brian Behlendorf
e4d1734eb1
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-18 10:05:59 -08:00
Brian Behlendorf
432399da0f
Add dropping written variable declaration
2008-12-18 10:03:57 -08:00
Brian Behlendorf
e7d8dc3064
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-18 09:06:25 -08:00
Brian Behlendorf
6b7c775e09
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-18 09:05:11 -08:00
Brian Behlendorf
06c9438f79
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-18 09:05:10 -08:00
Brian Behlendorf
cfc42cf0ab
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-18 09:05:09 -08:00
Brian Behlendorf
0392342e3d
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-18 09:05:08 -08:00
Brian Behlendorf
c37308fc20
Resolve stat conflict with stat()
2008-12-18 09:03:02 -08:00
Brian Behlendorf
d1684019b4
Move int out of for construct for c90 compliance
2008-12-18 09:01:48 -08:00
Brian Behlendorf
585fd3e1e9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 17:03:33 -08:00
Brian Behlendorf
53e66eef5a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 17:01:14 -08:00
Brian Behlendorf
6e26929ddf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 17:01:12 -08:00
Brian Behlendorf
420137d529
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 17:01:09 -08:00
Brian Behlendorf
194244b80b
Resolve read shadow conflict
2008-12-17 16:57:21 -08:00
Brian Behlendorf
9e0a99fda9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 13:11:41 -08:00
Brian Behlendorf
07411c1f84
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:10:39 -08:00
Brian Behlendorf
6ab9c098f1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:10:39 -08:00
Brian Behlendorf
9842c708fa
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:10:38 -08:00
Brian Behlendorf
1e3aeaaef1
Resolve shadow conflict
2008-12-17 13:08:39 -08:00
Brian Behlendorf
d621c591c9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 13:05:00 -08:00
Brian Behlendorf
b5740d86cf
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 13:03:57 -08:00
Brian Behlendorf
b9fe30002e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 13:03:57 -08:00
Brian Behlendorf
e41d37c49d
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 13:03:56 -08:00
Brian Behlendorf
fafeacb53f
Resolve shadow conflict
2008-12-17 13:01:56 -08:00
Brian Behlendorf
ad58c411bc
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:47:47 -08:00
Brian Behlendorf
863ec76ff7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 12:45:53 -08:00
Brian Behlendorf
941e464645
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:45:52 -08:00
Brian Behlendorf
a1b865abee
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-17 12:45:51 -08:00
Brian Behlendorf
da718dd80a
Resolve shadow conflict
2008-12-17 12:42:17 -08:00
Brian Behlendorf
e885dd3a7d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:29:14 -08:00
Brian Behlendorf
5fa2d90840
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 12:23:59 -08:00
Brian Behlendorf
9ef6211ce7
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 12:23:57 -08:00
Brian Behlendorf
e2a977c404
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-17 12:23:55 -08:00
Brian Behlendorf
b23299c7db
Fix two prototypes in the right place
2008-12-17 12:20:20 -08:00
Brian Behlendorf
3278f7b38d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2008-12-17 12:16:26 -08:00
Brian Behlendorf
385d51ad69
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-17 11:50:42 -08:00
Brian Behlendorf
6a509b3bca
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-17 11:50:41 -08:00
Brian Behlendorf
3719c4146d
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-17 11:50:40 -08:00
Brian Behlendorf
77811f8236
Fix prototype
2008-12-17 11:48:40 -08:00
Brian Behlendorf
a2d1d32c17
move vdev_disk to it's new home
2008-12-11 15:26:36 -08:00
Brian Behlendorf
593aa3e10d
Move all current Makefiles to correct locations, updates still needed
2008-12-11 14:55:55 -08:00
Brian Behlendorf
503068ecec
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-11 14:25:32 -08:00
Brian Behlendorf
f86c85c6a1
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 14:25:30 -08:00
Brian Behlendorf
4bc4fbeb38
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 14:25:29 -08:00
Brian Behlendorf
208f59182a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 14:25:28 -08:00
Brian Behlendorf
d7a401b296
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2008-12-11 14:25:25 -08:00
Brian Behlendorf
f1ab230869
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2008-12-11 14:25:23 -08:00
Brian Behlendorf
32a5a583a3
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 14:25:22 -08:00
Brian Behlendorf
b53201c0ca
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 14:25:16 -08:00
Brian Behlendorf
2243fa9633
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2008-12-11 14:25:12 -08:00
Brian Behlendorf
78b70a4471
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-11 14:25:10 -08:00
Brian Behlendorf
49c1b03fbc
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-12-11 14:25:09 -08:00
Brian Behlendorf
1e849d9b3b
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2008-12-11 14:25:08 -08:00
Brian Behlendorf
3f688a4bd8
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-11 14:25:07 -08:00
Brian Behlendorf
b8294b1311
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 14:25:05 -08:00
Brian Behlendorf
0595328655
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2008-12-11 14:25:03 -08:00
Brian Behlendorf
022db7f816
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 14:25:01 -08:00
Brian Behlendorf
ec2b4ef2ed
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2008-12-11 14:24:59 -08:00
Brian Behlendorf
9af6637db5
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 14:24:57 -08:00
Brian Behlendorf
c325ac879c
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 14:24:56 -08:00
Brian Behlendorf
3e2988aa8b
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 14:24:50 -08:00
Brian Behlendorf
82c8f9af50
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 14:24:49 -08:00
Brian Behlendorf
9b3c631dbd
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 14:24:48 -08:00
Brian Behlendorf
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
Brian Behlendorf
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
Brian Behlendorf
98ce19f04c
Update avl, nvpair, spl to unique build dirs
2008-12-11 13:54:57 -08:00
Brian Behlendorf
e1694cfaec
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-11 11:27:18 -08:00
Brian Behlendorf
8aad84f781
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-11 11:27:12 -08:00
Brian Behlendorf
e152d6e601
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 11:27:10 -08:00
Brian Behlendorf
c383dbedfd
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2008-12-11 11:27:00 -08:00
Brian Behlendorf
d50467b370
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2008-12-11 11:26:54 -08:00
Brian Behlendorf
206ceddde8
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2008-12-11 11:26:49 -08:00
Brian Behlendorf
f421307e1b
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 11:26:25 -08:00
Brian Behlendorf
ad55539f56
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2008-12-11 11:26:08 -08:00
Brian Behlendorf
fc3c415441
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-11 11:26:02 -08:00
Brian Behlendorf
3f2453fea7
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-12-11 11:25:56 -08:00
Brian Behlendorf
84e65c5c1e
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2008-12-11 11:25:50 -08:00
Brian Behlendorf
d00b912ed9
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-11 11:25:48 -08:00
Brian Behlendorf
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
Brian Behlendorf
3f25e7cd69
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2008-12-11 11:25:34 -08:00
Brian Behlendorf
d6ccbb14c5
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 11:25:28 -08:00
Brian Behlendorf
ff282a978f
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2008-12-11 11:25:22 -08:00
Brian Behlendorf
cdd670cb2f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 11:25:15 -08:00
Brian Behlendorf
8f8ac4288f
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2008-12-11 11:25:09 -08:00
Brian Behlendorf
b342e90e44
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 11:24:51 -08:00
Brian Behlendorf
4f5d567cfd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 11:24:45 -08:00
Brian Behlendorf
3420896332
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2008-12-11 11:24:42 -08:00
Brian Behlendorf
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00