7f3ee7a5ef
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 12:26:00 -07:00
e945770943
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 12:25:58 -07:00
0c3f631b72
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 12:25:32 -07:00
c4c4afd8fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 12:23:41 -07:00
6db8882b78
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 12:23:39 -07:00
76bf02aebb
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-09 12:23:36 -07:00
a19906fe65
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:13:56 -07:00
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
2018d0e610
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 10:41:54 -07:00
7a724b1db0
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 10:41:53 -07:00
64e827d295
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 10:41:30 -07:00
e5e94c40f7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 10:39:44 -07:00
aa8ed32ee8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 10:39:43 -07:00
9e394e10a9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-09 10:39:41 -07:00
43af29de5f
Type int accidentally not declared at the top of the function.
2009-07-09 10:19:02 -07:00
0d73002d8d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-08 09:18:20 -07:00
1e0e588128
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-08 09:18:18 -07:00
1355255010
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-08 09:17:52 -07:00
33077ad631
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-08 09:16:05 -07:00
f00e6fe5c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-08 09:16:04 -07:00
5fc46112cb
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-08 09:16:01 -07:00
58f5e63293
Resolve a 2 new cases of for loop variable declared in for()
2009-07-08 09:05:37 -07:00
6bc6e35298
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-07 16:32:58 -07:00
8028fd5db5
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-07 16:32:57 -07:00
deacdbc785
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 16:32:34 -07:00
0a00d10c24
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:30:57 -07:00
02362668ac
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:30:56 -07:00
24daf7747f
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
0e310d30de
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-07-07 16:30:54 -07:00
10dcf485d3
First fit allocator unused comment it out.
2009-07-07 16:23:09 -07:00
ebda366c1c
Add missing case introduced by rebase.
2009-07-07 16:22:33 -07:00
3977001d03
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-07 16:11:12 -07:00
80528a7792
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-07 16:11:11 -07:00
77e4a2039c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 16:10:51 -07:00
c460e5edb0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 16:09:15 -07:00
04a83f2337
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 16:09:13 -07:00
55b864f19b
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-07 16:09:12 -07:00
f80f59f955
Add missing paranthesis for gcc.
2009-07-07 16:01:13 -07:00
8e84e9205f
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-07 15:52:22 -07:00
1cf1fc91a1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-07 15:52:21 -07:00
91316b77b9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 15:51:57 -07:00
e5c8fcd6b0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 15:50:14 -07:00
c75167c985
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 15:50:13 -07:00
07a6b68575
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-07 15:50:11 -07:00
7373ddf55f
hash_lock should always be initialized
2009-07-07 15:41:19 -07:00
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
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
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
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
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