Brian Behlendorf
d3cb195b31
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-10 11:50:50 -07:00
Brian Behlendorf
b46157da8c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-10 11:50:46 -07:00
Brian Behlendorf
8a5b47ebb5
Add dmu_write_impl() prototype needed by zpios until a clean
...
zerocopy interface is available.
2009-07-10 11:39:37 -07:00
Brian Behlendorf
8bb9b8305a
Export new quota related symbols.
2009-07-10 11:38:53 -07:00
Brian Behlendorf
33eec3513e
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-10 10:55:07 -07:00
Brian Behlendorf
452ebd84b7
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-10 10:55:04 -07:00
Brian Behlendorf
0d4deb4760
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-10 10:54:18 -07:00
Brian Behlendorf
d97f750686
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-10 10:53:18 -07:00
Brian Behlendorf
bb9e6cc882
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-10 10:53:05 -07:00
Brian Behlendorf
f1ec04e192
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-10 10:52:50 -07:00
Brian Behlendorf
925fa57107
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-10 10:52:37 -07:00
Brian Behlendorf
df59544928
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-10 10:52:36 -07:00
Brian Behlendorf
e5d6b866f7
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-10 10:52:13 -07:00
Brian Behlendorf
ca2e8a0a7f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-10 10:52:11 -07:00
Brian Behlendorf
da907f8c39
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-10 10:50:45 -07:00
Brian Behlendorf
37e6d3e769
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-10 10:50:18 -07:00
Brian Behlendorf
b4a5983ebf
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-10 10:50:15 -07:00
Brian Behlendorf
4baa59ce44
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-10 10:50:13 -07:00
Brian Behlendorf
cfec48619c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-10 10:50:12 -07:00
Brian Behlendorf
84b52133f3
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-10 10:50:10 -07:00
Brian Behlendorf
f3c55459b0
Pull ; in to macro to ensure it get's entirely removed, C90 issue.
2009-07-10 10:40:55 -07:00
Brian Behlendorf
ec3045dcf2
Refine HAVE_ZPL checks after b117 update.
2009-07-10 10:39:44 -07:00
Brian Behlendorf
0c390c6de4
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-09 15:12:29 -07:00
Brian Behlendorf
0539df32a1
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 15:11:47 -07:00
Brian Behlendorf
f652333485
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 15:10:53 -07:00
Brian Behlendorf
9056388e75
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 15:10:39 -07:00
Brian Behlendorf
f9111d6e11
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 15:10:26 -07:00
Brian Behlendorf
bfcab44eb7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 15:10:14 -07:00
Brian Behlendorf
2ec527b793
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 15:10:12 -07:00
Brian Behlendorf
ac47fd1d1f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 15:09:51 -07:00
Brian Behlendorf
f8938a398f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 15:09:50 -07:00
Brian Behlendorf
195c942213
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-09 15:08:34 -07:00
Brian Behlendorf
791241dfb0
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 15:08:11 -07:00
Brian Behlendorf
7211f81057
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 15:08:07 -07:00
Brian Behlendorf
24662d61d9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 15:08:06 -07:00
Brian Behlendorf
2f4e745a09
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 15:08:04 -07:00
Brian Behlendorf
bed14af385
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-09 15:08:03 -07:00
Brian Behlendorf
ae132945b4
Add suggested paranthesis.
2009-07-09 14:59:10 -07:00
Brian Behlendorf
f13edd3084
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-09 14:20:38 -07:00
Brian Behlendorf
8a849a66fe
Wrap all the ACL interfaces for now with HAVE_ZPL. They are integrated
...
with the vfs layer which is not at all supported yet.
2009-07-09 14:11:13 -07:00
Brian Behlendorf
99880c2dc1
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-09 13:22:09 -07:00
Brian Behlendorf
a3a9c56aa1
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 13:21:25 -07:00
Brian Behlendorf
b11df77db9
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 13:20:27 -07:00
Brian Behlendorf
8fba9a5957
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 13:20:09 -07:00
Brian Behlendorf
8129849f84
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 13:19:55 -07:00
Brian Behlendorf
f99ad7f4c3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 13:19:41 -07:00
Brian Behlendorf
ebb013f2dd
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 13:19:39 -07:00
Brian Behlendorf
176ce8248a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 13:19:17 -07:00
Brian Behlendorf
db193d4ca9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 13:19:15 -07:00
Brian Behlendorf
029949d7c2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-09 13:17:56 -07:00
Brian Behlendorf
5b606597a8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 13:17:32 -07:00
Brian Behlendorf
617385b6f2
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 13:17:28 -07:00
Brian Behlendorf
17d368fa5f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 13:17:27 -07:00
Brian Behlendorf
a3bc97c2c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 13:17:26 -07:00
Brian Behlendorf
9ad0fef49e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
Brian Behlendorf
683b2f0d00
TopGit missed this update when I updated the same line in the
...
gcc-unused and gcc-uninit topic branches at the same time and
then ran 'tg update'. I'll need to keep that sort of thing
in mind when updating multiple topic branches between updates.
2009-07-09 13:07:05 -07:00
Brian Behlendorf
e05c1f7986
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-09 12:28:29 -07:00
Brian Behlendorf
af0e394f1e
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 12:27:45 -07:00
Brian Behlendorf
a88f5d6ce7
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 12:26:43 -07:00
Brian Behlendorf
b759d9db89
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 12:26:29 -07:00
Brian Behlendorf
5fb58ec621
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 12:26:14 -07:00
Brian Behlendorf
7f3ee7a5ef
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 12:26:00 -07:00
Brian Behlendorf
e945770943
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 12:25:58 -07:00
Brian Behlendorf
8551a101ea
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 12:25:34 -07:00
Brian Behlendorf
0c3f631b72
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 12:25:32 -07:00
Brian Behlendorf
8c3ccc7099
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-09 12:24:12 -07:00
Brian Behlendorf
999f693b85
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 12:23:46 -07:00
Brian Behlendorf
1708d28097
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 12:23:43 -07:00
Brian Behlendorf
c4c4afd8fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 12:23:41 -07:00
Brian Behlendorf
6db8882b78
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 12:23:39 -07:00
Brian Behlendorf
76bf02aebb
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-09 12:23:36 -07:00
Brian Behlendorf
a551134b2f
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:14:56 -07:00
Brian Behlendorf
a19906fe65
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:13:56 -07:00
Brian Behlendorf
f1d99c0653
Revert to original debugging code and wrap any variabled used only
...
within an ASSERT with the ASSERTV macro which will ensure it will
be removed when the ASSERTs are commented out. This makes gcc much
happier, makes the variables usage explicit, and removes the need
for the compiler to detect it is unused and do the right thing.
2009-07-09 12:10:52 -07:00
Brian Behlendorf
2ed7001286
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-09 10:44:11 -07:00
Brian Behlendorf
38d7e6d061
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 10:43:29 -07:00
Brian Behlendorf
5e10258e65
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 10:42:35 -07:00
Brian Behlendorf
2d4fa0b507
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-09 10:42:25 -07:00
Brian Behlendorf
e91a439720
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 10:42:21 -07:00
Brian Behlendorf
7120b27f27
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 10:42:09 -07:00
Brian Behlendorf
2018d0e610
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 10:41:54 -07:00
Brian Behlendorf
7a724b1db0
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 10:41:53 -07:00
Brian Behlendorf
19e8f65be3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 10:41:31 -07:00
Brian Behlendorf
64e827d295
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 10:41:30 -07:00
Brian Behlendorf
d8a401bacb
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-09 10:40:13 -07:00
Brian Behlendorf
149eea21db
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 10:39:49 -07:00
Brian Behlendorf
a8d32ac1e2
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 10:39:46 -07:00
Brian Behlendorf
e5e94c40f7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 10:39:44 -07:00
Brian Behlendorf
aa8ed32ee8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 10:39:43 -07:00
Brian Behlendorf
9e394e10a9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-09 10:39:41 -07:00
Brian Behlendorf
2cc278c96f
This change looks to have been made due to Sun bug 6803822, but
...
it's not exactly clear to me why. Regardless I'm taking it.
2009-07-09 10:30:06 -07:00
Brian Behlendorf
43af29de5f
Type int accidentally not declared at the top of the function.
2009-07-09 10:19:02 -07:00
Brian Behlendorf
4d410127b0
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-09 08:49:29 -07:00
Brian Behlendorf
cc6e67fa7f
Wrap sysevent includes until sysevent or something like it is implemented.
2009-07-09 08:40:33 -07:00
Brian Behlendorf
b12e8eb702
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-08 09:20:37 -07:00
Brian Behlendorf
cfa46b4440
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-08 09:19:57 -07:00
Brian Behlendorf
1ef0da1c7b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-08 09:19:03 -07:00
Brian Behlendorf
6e1c4e5bd6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-08 09:18:45 -07:00
Brian Behlendorf
e2e3b40ef9
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-08 09:18:32 -07:00
Brian Behlendorf
0d73002d8d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-08 09:18:20 -07:00
Brian Behlendorf
1e0e588128
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-08 09:18:18 -07:00
Brian Behlendorf
2aa22c1ccb
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-08 09:17:53 -07:00
Brian Behlendorf
1355255010
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-08 09:17:52 -07:00
Brian Behlendorf
368436bb83
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-08 09:16:33 -07:00
Brian Behlendorf
affa4ec536
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-08 09:16:10 -07:00
Brian Behlendorf
aa636ae442
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-08 09:16:07 -07:00
Brian Behlendorf
33077ad631
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-08 09:16:05 -07:00
Brian Behlendorf
f00e6fe5c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-08 09:16:04 -07:00
Brian Behlendorf
5fc46112cb
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-08 09:16:01 -07:00
Brian Behlendorf
58f5e63293
Resolve a 2 new cases of for loop variable declared in for()
2009-07-08 09:05:37 -07:00
Brian Behlendorf
28718acdab
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-07 17:13:35 -07:00
Brian Behlendorf
756d013735
Disable autoexpand notifing sysevent which is not supported.
2009-07-07 17:06:27 -07:00
Brian Behlendorf
85f46e8651
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 16:35:05 -07:00
Brian Behlendorf
dd1e80c3c5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-07 16:34:26 -07:00
Brian Behlendorf
dc5a90a00d
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-07 16:33:35 -07:00
Brian Behlendorf
b9813a2a75
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-07 16:33:24 -07:00
Brian Behlendorf
056bbc39b4
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-07 16:33:10 -07:00
Brian Behlendorf
6bc6e35298
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-07 16:32:58 -07:00
Brian Behlendorf
8028fd5db5
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-07 16:32:57 -07:00
Brian Behlendorf
68a0ba0bc3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-07 16:32:35 -07:00
Brian Behlendorf
deacdbc785
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 16:32:34 -07:00
Brian Behlendorf
3c42220ce1
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-07 16:31:22 -07:00
Brian Behlendorf
67e2052f52
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 16:31:01 -07:00
Brian Behlendorf
b6cf87b32d
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 16:30:58 -07:00
Brian Behlendorf
0a00d10c24
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:30:57 -07:00
Brian Behlendorf
02362668ac
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:30:56 -07:00
Brian Behlendorf
24daf7747f
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
Brian Behlendorf
0e310d30de
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
Brian Behlendorf
10dcf485d3
First fit allocator unused comment it out.
2009-07-07 16:23:09 -07:00
Brian Behlendorf
ebda366c1c
Add missing case introduced by rebase.
2009-07-07 16:22:33 -07:00
Brian Behlendorf
83bdfba9ad
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 16:13:12 -07:00
Brian Behlendorf
8b74968f01
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-07 16:12:37 -07:00
Brian Behlendorf
0e70c1ff85
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-07 16:11:49 -07:00
Brian Behlendorf
82ad66258e
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-07 16:11:37 -07:00
Brian Behlendorf
d9a91bf46b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-07 16:11:24 -07:00
Brian Behlendorf
3977001d03
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-07 16:11:12 -07:00
Brian Behlendorf
80528a7792
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-07 16:11:11 -07:00
Brian Behlendorf
f6880f590e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-07 16:10:52 -07:00
Brian Behlendorf
77e4a2039c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 16:10:51 -07:00
Brian Behlendorf
39ab61050e
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-07 16:09:42 -07:00
Brian Behlendorf
e122a47cd8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 16:09:19 -07:00
Brian Behlendorf
b8af4a2181
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 16:09:16 -07:00
Brian Behlendorf
c460e5edb0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:09:15 -07:00
Brian Behlendorf
04a83f2337
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:09:13 -07:00
Brian Behlendorf
55b864f19b
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-07 16:09:12 -07:00
Brian Behlendorf
f80f59f955
Add missing paranthesis for gcc.
2009-07-07 16:01:13 -07:00
Brian Behlendorf
09184991f6
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 15:54:35 -07:00
Brian Behlendorf
cc12f23682
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-07 15:53:55 -07:00
Brian Behlendorf
f24d102540
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-07 15:53:02 -07:00
Brian Behlendorf
21fa8cfb5d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-07 15:52:48 -07:00
Brian Behlendorf
190d24ca6b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-07 15:52:35 -07:00
Brian Behlendorf
8e84e9205f
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-07 15:52:22 -07:00
Brian Behlendorf
1cf1fc91a1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-07 15:52:21 -07:00
Brian Behlendorf
71a479fb53
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-07 15:51:59 -07:00
Brian Behlendorf
91316b77b9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 15:51:57 -07:00
Brian Behlendorf
f51ac052ef
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-07 15:50:42 -07:00
Brian Behlendorf
795d799358
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 15:50:19 -07:00
Brian Behlendorf
4abc33bbe4
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 15:50:16 -07:00
Brian Behlendorf
e5c8fcd6b0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 15:50:14 -07:00
Brian Behlendorf
c75167c985
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 15:50:13 -07:00
Brian Behlendorf
07a6b68575
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-07 15:50:11 -07:00
Brian Behlendorf
7373ddf55f
hash_lock should always be initialized
2009-07-07 15:41:19 -07:00
Brian Behlendorf
20989cd4f2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:43 -07:00
Brian Behlendorf
e49bdb470e
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:42 -07:00
Brian Behlendorf
169b3085db
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
...
Conflicts:
module/zfs/dmu.c
2009-07-06 17:01:30 -07:00
Brian Behlendorf
621679fec6
Update to use dmu_read() instead of dmu_read_impl() now that a 'flags'
...
argument is available. This flags argument was added to allow a clean
API for disabling prefetch, so I'll update zpios to use it in preference
to the module option hack used before.
2009-07-06 16:51:59 -07:00
Brian Behlendorf
1175906fbc
Update zerocopy patch to be consistent with new flags arg
...
passed to dmu_read(). It would be nice to have one of these
for dmu_write() as well but we have do without for now.
2009-07-06 16:01:41 -07:00
Brian Behlendorf
07a56371aa
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/zfs_vfsops.c
2009-07-06 15:17:38 -07:00
Brian Behlendorf
a6b1465e30
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/include/sys/zfs_fuid.h
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 15:16:54 -07:00
Brian Behlendorf
d65102b493
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-06 15:08:57 -07:00
Brian Behlendorf
2b582c34cb
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
...
Conflicts:
module/zfs/zfs_ioctl.c
2009-07-06 15:03:54 -07:00
Brian Behlendorf
f48b799f78
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-06 15:03:09 -07:00
Brian Behlendorf
b56250900b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-06 15:02:55 -07:00
Brian Behlendorf
ae68a8980c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
...
Conflicts:
module/zfs/include/sys/dmu.h
2009-07-06 15:02:33 -07:00
Brian Behlendorf
1cf1a077cd
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
...
Conflicts:
module/zfs/dmu.c
module/zfs/include/sys/dmu.h
2009-07-06 15:00:24 -07:00
Brian Behlendorf
4fa3570131
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-06 13:47:16 -07:00
Brian Behlendorf
266a7d8cd7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zcommon/zfs_namecheck.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
2009-07-06 13:47:04 -07:00
Brian Behlendorf
4a7761abd2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-06 13:43:07 -07:00
Brian Behlendorf
149c4b2731
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_pool.c
module/zcommon/zfs_namecheck.c
module/zfs/dmu.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 13:40:29 -07:00
Brian Behlendorf
e3d05c97eb
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-06 13:17:32 -07:00
Brian Behlendorf
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
Brian Behlendorf
8795d8f034
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-07-06 13:15:43 -07:00
Brian Behlendorf
95ba24ed69
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:15:35 -07:00
Brian Behlendorf
d369760713
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-07-06 13:14:41 -07:00
Brian Behlendorf
326bb586bd
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-07-06 13:13:20 -07:00
Brian Behlendorf
01c3cfc58f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
module/zfs/zil.c
2009-07-06 13:12:23 -07:00
Brian Behlendorf
3ada0935a3
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-07-06 13:11:56 -07:00
Brian Behlendorf
a1ccb00b7e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
module/zfs/zil.c
2009-07-06 13:11:34 -07:00
Brian Behlendorf
c66757e332
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/fletcher.c
2009-07-02 17:07:06 -07:00
Brian Behlendorf
a06a428e15
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zinject/zinject.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/dmu_object.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
2009-07-02 17:06:20 -07:00
Brian Behlendorf
bc330e731d
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-07-02 16:59:46 -07:00
Brian Behlendorf
244d656e28
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-07-02 16:59:39 -07:00
Brian Behlendorf
9550da2ba6
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
...
Conflicts:
module/zfs/arc.c
module/zfs/zio.c
2009-07-02 16:58:33 -07:00
Brian Behlendorf
44703f0029
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/spa.c
2009-07-02 16:57:09 -07:00
Brian Behlendorf
eb0137f395
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
2009-07-02 16:55:22 -07:00
Brian Behlendorf
a5a71d128d
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/spa.c
2009-07-02 16:52:07 -07:00
Brian Behlendorf
e2b2597751
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zinject/zinject.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_object.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa.c
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
2009-07-02 16:49:11 -07:00
Brian Behlendorf
e9f14862a5
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/vdev_label.c
module/zfs/zio.c
2009-07-02 16:18:03 -07:00
Brian Behlendorf
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
Brian Behlendorf
df388bfc0a
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-01 11:11:48 -07:00
Brian Behlendorf
94390a0793
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-01 11:11:27 -07:00
Brian Behlendorf
10c43094ed
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-01 11:10:58 -07:00
Brian Behlendorf
3c96976b99
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-01 11:10:51 -07:00
Brian Behlendorf
212ecc6560
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-01 11:10:44 -07:00
Brian Behlendorf
bfa8b02c2c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-01 11:10:37 -07:00
Brian Behlendorf
d4721058bc
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-01 11:10:36 -07:00
Brian Behlendorf
a37fb966bd
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-01 11:10:25 -07:00
Brian Behlendorf
8c684c8d85
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-01 11:10:24 -07:00
Brian Behlendorf
7262d13e72
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-01 11:09:45 -07:00
Brian Behlendorf
b44445a8f1
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-01 11:09:33 -07:00
Brian Behlendorf
fa91b5d59b
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-01 11:09:31 -07:00
Brian Behlendorf
ef0a712858
Distro friendly build system / packaging improvements.
...
These changes bring the zfs-0.4.4 tree in to compliance with
the spl-0.4.4 packaging changes. The bottom line is 2 source
rpms and 4 binary rpms will now be generated when creating
packages there will be:
zfs-<version>.src.rpm
- Fully rebuildable source rpm for libzfs and utils.
zfs-modules-<version>.src.rpm
- Fully rebuildable source rpm for kernel modules.
zfs-<version>.<arch>.rpm
- Binary rpm for libzfs and utils. The utils in this package are
compatible with all zfs-module rpms of the same version.
zfs-devel-<version>.<arch>.rpm
- Binary rpm containing headers for building against libzfs libraries.
zfs-modules-<verion>-<kernel>.arch.rpm
- Binary rpm containing the kernel modules for a specific kernel build.
The package name contains the kernel version and you should have one
of these packages installed to match every kernel on your system.
zfs-modules-devel-<verion>-<kernel>.arch.rpm
- Binary rpm containing development header and module symbols needed
for building additional kernel modules which are dependent on the
zfs module stack.
Expect minor interations on these changes as I validate they work
properly on CHAOS, RHEL, Fedora, and SLES style distros.
2009-07-01 10:53:05 -07:00
Brian Behlendorf
26bea36f61
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-06-08 13:24:19 -07:00
Brian Behlendorf
2968e197aa
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-06-08 13:24:17 -07:00
Brian Behlendorf
737a6ba81a
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-06-08 13:23:40 -07:00
Brian Behlendorf
041457706f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-06-08 13:23:35 -07:00
Brian Behlendorf
96da8b0db7
Add missing EXPORT_SYMBOL() to dmu_tx_callback_register().
2009-06-08 13:08:14 -07:00
Brian Behlendorf
cc5ce72296
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-20 13:26:38 -07:00
Brian Behlendorf
f47473638b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-20 13:26:36 -07:00
Brian Behlendorf
9806b5c02b
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-20 13:26:18 -07:00
Brian Behlendorf
6bf1e782f4
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-20 13:26:16 -07:00
Brian Behlendorf
9bee47e648
Export additional txg_* symbols.
2009-03-20 13:17:23 -07:00
Brian Behlendorf
f764039e87
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:32:26 -07:00
Brian Behlendorf
aee87a5ab6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 21:31:54 -07:00
Brian Behlendorf
b58bf81e15
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-19 21:31:06 -07:00
Brian Behlendorf
4298933698
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-19 21:30:56 -07:00
Brian Behlendorf
a85dce5add
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 21:30:46 -07:00
Brian Behlendorf
8c8e10d491
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 21:30:35 -07:00
Brian Behlendorf
18569f4b9e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 21:30:34 -07:00
Brian Behlendorf
cc0a015671
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-19 21:30:17 -07:00
Brian Behlendorf
61914d7403
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 21:30:15 -07:00
Brian Behlendorf
30eaed5564
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-19 21:29:14 -07:00
Brian Behlendorf
56d18263ed
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 21:28:54 -07:00
Brian Behlendorf
0ebc97288a
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-19 21:28:52 -07:00
Brian Behlendorf
bd1685ee4e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 21:28:51 -07:00
Brian Behlendorf
1769e10f17
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-19 21:28:50 -07:00
Brian Behlendorf
6d883d7d40
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 21:28:48 -07:00
Brian Behlendorf
fed604c844
Add extra () requested by gcc
2009-03-19 21:18:54 -07:00
Brian Behlendorf
4f2dfa3c94
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:13:11 -07:00
Brian Behlendorf
665c272091
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 21:11:35 -07:00
Brian Behlendorf
f87494c866
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
...
Conflicts:
module/zfs/txg.c
2009-03-19 21:10:40 -07:00
Brian Behlendorf
b08807315c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-19 21:09:02 -07:00
Brian Behlendorf
4ed190513e
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 21:08:51 -07:00
Brian Behlendorf
57c6cf3c4c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 21:08:41 -07:00
Brian Behlendorf
bf3d911bc1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 21:08:39 -07:00
Brian Behlendorf
0173e5dce7
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-19 21:08:22 -07:00
Brian Behlendorf
275f4aae5d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dmu_tx.c
2009-03-19 21:08:17 -07:00
Brian Behlendorf
cc4c1dbc8d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-19 21:06:25 -07:00
Brian Behlendorf
00d8d21f51
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-19 21:06:15 -07:00
Brian Behlendorf
7f33364d3c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zfs/dmu_tx.c
module/zfs/txg.c
2009-03-19 21:03:58 -07:00
Brian Behlendorf
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -07:00
Brian Behlendorf
eb811f7fa9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
Brian Behlendorf
f180959bac
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 20:51:18 -07:00
Brian Behlendorf
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
Brian Behlendorf
a9eba02cdb
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 15:31:53 -07:00
Brian Behlendorf
d7243f7729
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 15:31:32 -07:00
Brian Behlendorf
d751357f54
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-19 15:31:04 -07:00
Brian Behlendorf
7c39f7c920
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-19 15:30:57 -07:00
Brian Behlendorf
a2a33f17e4
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 15:30:50 -07:00
Brian Behlendorf
852952d742
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 15:30:44 -07:00
Brian Behlendorf
146fb170ef
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 15:30:43 -07:00
Brian Behlendorf
86681399b8
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-19 15:30:33 -07:00
Brian Behlendorf
e1540e9cbb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 15:30:32 -07:00
Brian Behlendorf
e75034b8e9
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-19 15:29:52 -07:00
Brian Behlendorf
7e8fa40f4d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 15:29:38 -07:00
Brian Behlendorf
aa729c745c
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-19 15:29:36 -07:00
Brian Behlendorf
db3436fafe
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 15:29:35 -07:00
Brian Behlendorf
2518c98d9e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:29:34 -07:00
Brian Behlendorf
c8c4948d00
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-03-19 15:29:33 -07:00
Brian Behlendorf
60d25f4b93
The patch resolves the extra call to dnode_cons() in dnode_create().
...
The extra call to the constructor was there to reinitialize the non-
trivial primatives in the dnode (lists, mutexs, condvars, avl tree, etc).
This was safe, although not exactly clean, on Solaris because none of
the primitives allocate memory. In the Linux port this is not true.
To keep stack usage to a minimum several of the primatives dynamically
allocate memory thus initializing them twice results in a memory leak.
This patch resolves this problem for Solaris and Linux by ensuring all
*_inits are called in the constructor, and all *_destroys are called
in the destructor. Additionally we ensure that all dnode objects are
properly deconstructed before being freed to the slab, and when the
objects are allocated from the slab all required data members are
explicity initialized to correct values.
2009-03-19 15:22:48 -07:00
Brian Behlendorf
70c010a7ac
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 15:09:47 -07:00
Brian Behlendorf
c495a4bd1f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 15:09:24 -07:00
Brian Behlendorf
2a5c75d514
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-19 15:08:54 -07:00
Brian Behlendorf
8b0f4fa45c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-19 15:08:46 -07:00
Brian Behlendorf
b313904c89
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-19 15:08:39 -07:00
Brian Behlendorf
f36defdaa7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 15:08:31 -07:00
Brian Behlendorf
0b74b5ae59
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 15:08:30 -07:00
Brian Behlendorf
099dd7e175
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-19 15:08:18 -07:00
Brian Behlendorf
fd3db92fe7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 15:08:17 -07:00
Brian Behlendorf
5a85b97928
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-19 15:07:35 -07:00
Brian Behlendorf
8cdd340206
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-19 15:07:21 -07:00
Brian Behlendorf
fac4873ad7
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-19 15:07:19 -07:00
Brian Behlendorf
90bbbd109b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 15:07:19 -07:00
Brian Behlendorf
f07d61a8c1
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:07:18 -07:00
Brian Behlendorf
cc032b6337
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-03-19 15:07:16 -07:00
Brian Behlendorf
9bbf8f1761
Resolve conflict with fix-dnode-cons
2009-03-19 15:02:05 -07:00
Brian Behlendorf
1c925dc4ce
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-17 16:33:47 -07:00
Brian Behlendorf
02424a268b
Use spl_device_* macro's for portability.
2009-03-17 16:27:57 -07:00
Brian Behlendorf
015c4a4deb
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-17 16:07:02 -07:00
Brian Behlendorf
1f84b8ed2c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-17 16:07:01 -07:00
Brian Behlendorf
f8cd6b6b49
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-17 16:06:51 -07:00
Brian Behlendorf
80e98bb0f5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-17 16:06:50 -07:00
Brian Behlendorf
a9b0088f48
Use include missing zfs_config.h and use ZFS_META_VERSION (not VERSION)
2009-03-17 16:02:09 -07:00
Brian Behlendorf
a0155baaa9
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-17 15:25:57 -07:00
Brian Behlendorf
23c544c884
Add zfs_config.h include for HAVE_2ARGS_BIO_END_IO_T define
2009-03-17 15:14:02 -07:00
Brian Behlendorf
da843563aa
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-16 16:23:03 -07:00
Brian Behlendorf
563c0614c4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-16 16:22:19 -07:00
Brian Behlendorf
b7f6b6e19d
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-16 16:21:15 -07:00
Brian Behlendorf
4bcfe17f4d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-16 16:21:00 -07:00
Brian Behlendorf
c72f5112d3
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-16 16:20:45 -07:00
Brian Behlendorf
f7087f0431
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-16 16:20:30 -07:00
Brian Behlendorf
f073f197bc
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-16 16:20:29 -07:00
Brian Behlendorf
7ca5472963
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-16 16:20:03 -07:00
Brian Behlendorf
5edabb999f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-16 16:20:02 -07:00
Brian Behlendorf
11d99f4112
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-16 16:18:27 -07:00
Brian Behlendorf
f28a31a09a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-16 16:18:01 -07:00
Brian Behlendorf
61926abf0f
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-16 16:17:58 -07:00
Brian Behlendorf
df985d53db
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 16:17:57 -07:00
Brian Behlendorf
f86b52a39d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-16 16:17:55 -07:00
Brian Behlendorf
3eebe1bd0e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-16 16:17:54 -07:00
Brian Behlendorf
3eb4ba3ebd
Add 3 more uninit errors detected by gcc 3.4.0 compiler.
2009-03-16 16:06:50 -07:00
Brian Behlendorf
709c447ce6
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-16 11:41:18 -07:00
Brian Behlendorf
7bca8f1926
Use vmem_size() only on i386 systems and in the kernel.
2009-03-16 11:27:26 -07:00
Brian Behlendorf
b289a33e68
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-13 11:01:27 -07:00
Brian Behlendorf
abfd24f708
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-13 11:00:47 -07:00
Brian Behlendorf
339553bdea
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-13 11:00:03 -07:00
Brian Behlendorf
a4f8aecbe8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-13 10:59:53 -07:00
Brian Behlendorf
ab636c01ec
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-13 10:59:42 -07:00
Brian Behlendorf
344e59a582
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-13 10:59:32 -07:00
Brian Behlendorf
b60dd0bdd7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-13 10:59:31 -07:00
Brian Behlendorf
f21bd57c48
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-13 10:59:15 -07:00
Brian Behlendorf
adf984639d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-13 10:59:14 -07:00
Brian Behlendorf
d3afa01aa9
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-13 10:58:14 -07:00
Brian Behlendorf
d7f60ff869
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-13 10:57:50 -07:00
Brian Behlendorf
648bbdebbe
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-13 10:57:47 -07:00
Brian Behlendorf
486df2d11d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-13 10:57:46 -07:00
Brian Behlendorf
36c46c6031
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-13 10:57:45 -07:00
Brian Behlendorf
d2910d2415
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-13 10:57:43 -07:00
Brian Behlendorf
c98996ded8
Explicitly cast to prevent 'void *' dereference.
2009-03-13 10:51:11 -07:00
Brian Behlendorf
d032066bf3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-03-12 10:51:22 -07:00
Brian Behlendorf
b625eab814
Move upcall after run_args are initialized.
2009-03-12 10:46:54 -07:00
Brian Behlendorf
bb06faa046
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 10:40:54 -07:00
Brian Behlendorf
58e63ca4cc
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:40:17 -07:00
Brian Behlendorf
7f8c9b233a
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-12 10:39:34 -07:00
Brian Behlendorf
71188348b0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 10:39:26 -07:00
Brian Behlendorf
e0b048a823
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 10:39:17 -07:00
Brian Behlendorf
8206ed9aea
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 10:39:00 -07:00
Brian Behlendorf
4d0f64844d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 10:38:59 -07:00
Brian Behlendorf
5303323f3a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 10:38:45 -07:00
Brian Behlendorf
2ff032fd60
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 10:38:44 -07:00
Brian Behlendorf
bccbb40991
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-12 10:37:33 -07:00
Brian Behlendorf
9bdbd7c8f7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:37:18 -07:00
Brian Behlendorf
c8368a8daa
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 10:37:15 -07:00
Brian Behlendorf
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -07:00
Brian Behlendorf
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
Brian Behlendorf
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
Brian Behlendorf
cabd4a69c4
Resolve remaining uninitialized variables
...
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
2009-03-12 10:30:41 -07:00
Brian Behlendorf
a59f378c54
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-12 10:03:31 -07:00
Brian Behlendorf
308903afa4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-12 10:02:53 -07:00
Brian Behlendorf
8feb346bcd
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-12 10:02:13 -07:00
Brian Behlendorf
0c2f0dd6be
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-12 10:02:05 -07:00
Brian Behlendorf
2a002fd082
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-12 10:01:56 -07:00
Brian Behlendorf
7605051f07
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 10:01:43 -07:00
Brian Behlendorf
a4b92c0710
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 10:01:41 -07:00
Brian Behlendorf
cebf08458e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-12 10:01:27 -07:00
Brian Behlendorf
165b2611d2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-12 10:01:25 -07:00
Brian Behlendorf
ac9df9b68b
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-12 10:00:24 -07:00
Brian Behlendorf
0cdc14e427
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-12 10:00:07 -07:00
Brian Behlendorf
a459fe3e3f
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-12 10:00:05 -07:00
Brian Behlendorf
dd30dba016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:00:04 -07:00
Brian Behlendorf
193ea156e9
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:00:03 -07:00
Brian Behlendorf
eceaf813ad
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-03-12 10:00:01 -07:00
Brian Behlendorf
f2d72af596
Add remaining missing cases (or a default) to all switch statements.
...
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements. The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
2009-03-12 09:53:08 -07:00
Brian Behlendorf
0d19b2613b
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-03-11 22:50:31 -07:00
Brian Behlendorf
7dda95296c
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 22:50:29 -07:00
Brian Behlendorf
ef003a41c3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 22:50:02 -07:00
Brian Behlendorf
68818f8c51
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-11 22:49:33 -07:00
Brian Behlendorf
7ffff81846
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 22:49:26 -07:00
Brian Behlendorf
08a409f648
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 22:49:17 -07:00
Brian Behlendorf
ec7bd3f401
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-11 22:49:10 -07:00
Brian Behlendorf
882ac1e50f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-11 22:49:09 -07:00
Brian Behlendorf
f9494814c2
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 22:48:56 -07:00
Brian Behlendorf
dadb99c29a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-11 22:48:55 -07:00
Brian Behlendorf
c47399ecf6
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-11 22:48:11 -07:00
Brian Behlendorf
901d2a8d13
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 22:47:58 -07:00
Brian Behlendorf
1b9605212b
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 22:47:56 -07:00
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
1c0279a08f
Resolve newly revealed unused vars and symbols caused by topic branch.
2009-03-11 22:43:09 -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
6315decd17
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 22:30:26 -07:00
Brian Behlendorf
01c24c3a86
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-11 22:29:57 -07:00
Brian Behlendorf
0d081696b1
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-03-11 22:29:19 -07:00
Brian Behlendorf
adcaad04be
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-03-11 22:29:12 -07:00
Brian Behlendorf
bc61ef667f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-03-11 22:29:09 -07:00
Brian Behlendorf
c57d3bce5c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-03-11 22:29:00 -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
0dcd576c67
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-11 22:28:33 -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
ada5743876
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-03-11 22:27:35 -07:00
Brian Behlendorf
24e488aa55
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-11 22:27:18 -07:00
Brian Behlendorf
e6941c57fe
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-03-11 22:27:16 -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
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
cb52b25a43
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-11 21:03:09 -07:00