Brian Behlendorf
909582a95e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 22:47:56 -07:00
Brian Behlendorf
6211d1a370
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 22:47:54 -07:00
Brian Behlendorf
a2dc88da2a
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-03-11 22:47:53 -07:00
Brian Behlendorf
462f864365
Check should be in ASSERT to minimize stack and prevent unused var.
2009-03-11 22:38:16 -07:00
Brian Behlendorf
38e76d0b22
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 22:28:48 -07:00
Brian Behlendorf
e5c0a2a2f7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 22:28:47 -07:00
Brian Behlendorf
cb75043186
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 22:28:31 -07:00
Brian Behlendorf
e625efa701
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 22:27:15 -07:00
Brian Behlendorf
c9daa4fbd2
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 22:27:14 -07:00
Brian Behlendorf
246cae3509
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-11 22:27:11 -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
f88492180c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 21:01:22 -07:00
Brian Behlendorf
e140466d9c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 21:01:21 -07:00
Brian Behlendorf
b6616bd2c6
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 21:01:03 -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
f6ef07fab5
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 16:28:01 -07:00
Brian Behlendorf
2b85d248b9
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 16:28:00 -07:00
Ricardo M. Correia
8680138968
Add missing EXPORT_SYMBOL() macro.
...
ZFS consumers such as Lustre should have access to these symbols.
2009-03-11 16:22:11 -07:00
Brian Behlendorf
5bc6a80f81
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 14:11:04 -07:00
Brian Behlendorf
3d59bda174
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 14:11:03 -07:00
Brian Behlendorf
ab760deda7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 14:10:39 -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
e5aea7e980
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 13:25:45 -07:00
Brian Behlendorf
6ffd92964e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 13:25:44 -07:00
Brian Behlendorf
5915d545e9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 13:25:23 -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
67bb58519f
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 12:45:41 -07:00
Brian Behlendorf
aa3c9e30f4
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 12:45:39 -07:00
Brian Behlendorf
9ceea9faf2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 12:45:15 -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
f39cd76b0b
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 11:18:05 -07:00
Brian Behlendorf
96cc021270
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 11:18:01 -07:00
Brian Behlendorf
7a08ef9d52
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/spa_boot.c
2009-03-11 11:17:23 -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
a3da614c79
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 10:42:31 -07:00
Brian Behlendorf
4231a48b17
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 10:42:30 -07:00
Brian Behlendorf
5067076033
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 10:42: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
55dcb5b609
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-10 21:40:37 -07:00
Brian Behlendorf
a03a940a3b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-10 21:40:35 -07:00
Brian Behlendorf
952e70b1a0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-10 21:40:19 -07:00
Brian Behlendorf
4911b7be4d
zpios subdir should be on linux-zpios branch
2009-03-10 21:33:24 -07:00
Brian Behlendorf
799aae7107
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-10 21:27:22 -07:00
Brian Behlendorf
729130ffaa
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-10 21:27:20 -07:00
Brian Behlendorf
e610bf6e09
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-10 21:26:59 -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
2cbe1d0785
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-18 16:38:16 -08:00
Brian Behlendorf
fab643a25b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-18 16:38:15 -08:00
Brian Behlendorf
87245deaab
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 16:37: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
c44051f635
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-18 16:22:25 -08:00
Brian Behlendorf
9aab96eb9d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-18 16:22:23 -08:00
Brian Behlendorf
b4b7da1314
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 16:22:02 -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
47c6526993
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-18 14:35:09 -08:00
Brian Behlendorf
8241395b5a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-18 14:35:05 -08:00
Brian Behlendorf
9f4865e4ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 14:34:45 -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
7fe1b71533
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-02-18 14:29:19 -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
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
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
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
f1300cddb7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 16:32:30 -08:00
Brian Behlendorf
f33c13d11d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 16:32:27 -08:00
Brian Behlendorf
41cba9f136
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 16:32:08 -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
865347e0be
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 15:30:05 -08:00
Brian Behlendorf
702ba8cdf7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 15:30:04 -08:00
Brian Behlendorf
9c8802c7e4
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 15:29:55 -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
c6412aa523
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 14:52:57 -08:00
Brian Behlendorf
7c879f3b8b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 14:52:56 -08:00
Brian Behlendorf
141235d905
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 14:52:47 -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
dd2e5734f7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 14:39:26 -08:00
Brian Behlendorf
4c1ba3d379
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 14:39:25 -08:00
Brian Behlendorf
1a4ae03863
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 14:39:18 -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
574b2c897e
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 14:29:58 -08:00
Brian Behlendorf
372dba924d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 14:29:58 -08:00
Brian Behlendorf
ab52989424
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-15 14:29:50 -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
924bc262cc
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-15 14:21:05 -08:00
Brian Behlendorf
ee1faab64d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-15 14:21:03 -08:00
Brian Behlendorf
091a4a4ca4
Resolve conflict with removed cleaner type
2009-01-15 14:20:49 -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
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
216ce72418
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-15 14:13:46 -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
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
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
1b6bc0866d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-14 13:32:40 -08:00
Brian Behlendorf
b874e980f9
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-14 13:32:39 -08:00
Brian Behlendorf
c0edd1f948
Remove unneeded header
2009-01-14 13:30:32 -08:00
Brian Behlendorf
926ec0657d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-14 08:42:21 -08:00
Brian Behlendorf
04443d2d7a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-14 08:42:19 -08:00
Brian Behlendorf
f63f4dd2cd
Remove unneeded chunk, create a FS the real way with an ioctl
2009-01-14 08:26:09 -08:00
Brian Behlendorf
ef9e51e506
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-13 16:08:03 -08:00
Brian Behlendorf
97f656ab18
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-13 16:08:02 -08:00
Brian Behlendorf
fce0143a40
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 16:07:45 -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
d92517e2a1
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-13 15:34:46 -08:00
Brian Behlendorf
9cccf52448
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-13 15:34:46 -08:00
Brian Behlendorf
c3335290e2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 15:34:38 -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
5691cd6443
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-13 15:07:53 -08:00
Brian Behlendorf
f661985075
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-13 15:07:52 -08:00
Brian Behlendorf
925ed2c7a0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 15:07:44 -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
28d3375587
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-13 15:02:58 -08:00
Brian Behlendorf
3486f62c97
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-13 15:02:57 -08:00
Brian Behlendorf
042deede25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 15:02:49 -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
b935807a03
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-13 14:18:58 -08:00
Brian Behlendorf
95b289e62b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-13 14:18:58 -08:00
Brian Behlendorf
b289f6dd98
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 14:18:50 -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
4b655d95db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-13 13:33:17 -08:00
Brian Behlendorf
a5643b08c3
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-13 13:33:16 -08:00
Brian Behlendorf
935c8157f9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-13 13:33:09 -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
1481a4a7df
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-13 12:32:19 -08:00
Brian Behlendorf
d07009d2f7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-13 12:32:18 -08:00
Brian Behlendorf
5a36a4b40b
Pull in needed hunk from old patch stack for a ZFS build without the ZPL support
2009-01-13 12:28:26 -08:00
Brian Behlendorf
0093e81879
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 16:54:05 -08:00
Brian Behlendorf
ca328c5d30
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 16:54:04 -08:00
Brian Behlendorf
3977cefecc
Update load/unload message, mknod /dev/zfs when udev is unavailable
2009-01-09 16:50:28 -08:00
Brian Behlendorf
3122996061
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 16:42:02 -08:00
Brian Behlendorf
d6e2f4a455
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 16:42:01 -08:00
Brian Behlendorf
7001fd57fa
Register sensible init/fini hooks
2009-01-09 16:38:13 -08:00
Brian Behlendorf
91f6492ef5
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 16:32:26 -08:00
Brian Behlendorf
4530d592f8
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 16:32:24 -08:00
Brian Behlendorf
d9a45283ce
Add ZFS load/unload console messages
2009-01-09 16:28:26 -08:00
Brian Behlendorf
c0f45a99fc
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 15:52:08 -08:00
Brian Behlendorf
3f70ee0f8a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 15:52:07 -08:00
Brian Behlendorf
1dc5e6d02e
Remove HAVE_SPL should be HAVE_ZPL
2009-01-09 15:50:00 -08:00
Brian Behlendorf
c766077d8c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 14:45:52 -08:00
Brian Behlendorf
3f48c3fcd5
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 14:45:52 -08:00
Brian Behlendorf
be3a17e437
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 14:45:45 -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
36eeb5eeb2
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 14:18:34 -08:00
Brian Behlendorf
b55164f2cb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 14:18:33 -08:00
Brian Behlendorf
03a4aefbcf
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 14:18:25 -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
6a2d852b35
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 13:33:56 -08:00
Brian Behlendorf
c7b309f9b1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 13:33:55 -08:00
Brian Behlendorf
bc5e2d8660
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 13:33:48 -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
68585e71a8
Get correct exit prototype
2009-01-09 13:28:42 -08:00
Brian Behlendorf
6e62e110c3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 12:48:35 -08:00
Brian Behlendorf
9199436355
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 12:48:34 -08:00
Brian Behlendorf
18f3ecb485
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-09 12:48:17 -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
a18eb3cc93
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 11:44:43 -08:00
Brian Behlendorf
2735cd4ab1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 11:44:43 -08:00
Brian Behlendorf
f0f1f7362d
Remove invalid tunable
2009-01-09 11:42:31 -08:00
Brian Behlendorf
a4df8635db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 11:31:48 -08:00
Brian Behlendorf
ab0e08c058
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 11:31:47 -08:00
Brian Behlendorf
dd50143ea1
Add module load/unload entry point hooks and ioctl integration
2009-01-09 11:21:59 -08:00
Brian Behlendorf
62ce4aabc6
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-09 09:22:33 -08:00
Brian Behlendorf
47f49e3634
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-09 09:22:33 -08:00