cc5ce72296
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-20 13:26:38 -07:00
f47473638b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-20 13:26:36 -07:00
9bee47e648
Export additional txg_* symbols.
2009-03-20 13:17:23 -07:00
8c8e10d491
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 21:30:35 -07:00
18569f4b9e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 21:30:34 -07:00
61914d7403
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 21:30:15 -07:00
bd1685ee4e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 21:28:51 -07:00
1769e10f17
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-03-19 21:28:50 -07:00
6d883d7d40
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 21:28:48 -07:00
fed604c844
Add extra () requested by gcc
2009-03-19 21:18:54 -07:00
57c6cf3c4c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 21:08:41 -07:00
bf3d911bc1
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 21:08:39 -07:00
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
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -07:00
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
f180959bac
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-03-19 20:51:18 -07:00
29703a5b4e
Add 'feature-commit-cb' branch for DMU commit callbacks.
2009-03-19 20:30:14 -07:00
852952d742
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 15:30:44 -07:00
146fb170ef
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 15:30:43 -07:00
e1540e9cbb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 15:30:32 -07:00
db3436fafe
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 15:29:35 -07:00
2518c98d9e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:29:34 -07:00
c8c4948d00
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-03-19 15:29:33 -07:00
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
f36defdaa7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-19 15:08:31 -07:00
0b74b5ae59
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-19 15:08:30 -07:00
fd3db92fe7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 15:08:17 -07:00
90bbbd109b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 15:07:19 -07:00
f07d61a8c1
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 15:07:18 -07:00
cc032b6337
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-03-19 15:07:16 -07:00
9bbf8f1761
Resolve conflict with fix-dnode-cons
2009-03-19 15:02:05 -07:00
015c4a4deb
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-17 16:07:02 -07:00
1f84b8ed2c
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-17 16:07:01 -07:00
a9b0088f48
Use include missing zfs_config.h and use ZFS_META_VERSION (not VERSION)
2009-03-17 16:02:09 -07:00
f7087f0431
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-16 16:20:30 -07:00
f073f197bc
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-16 16:20:29 -07:00
5edabb999f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-16 16:20:02 -07:00
df985d53db
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-16 16:17:57 -07:00
f86b52a39d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-16 16:17:55 -07:00
3eebe1bd0e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-16 16:17:54 -07:00
3eb4ba3ebd
Add 3 more uninit errors detected by gcc 3.4.0 compiler.
2009-03-16 16:06:50 -07:00
344e59a582
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-13 10:59:32 -07:00
b60dd0bdd7
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-13 10:59:31 -07:00
adf984639d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-13 10:59:14 -07:00
486df2d11d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-13 10:57:46 -07:00
36c46c6031
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-13 10:57:45 -07:00
d2910d2415
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-03-13 10:57:43 -07:00
c98996ded8
Explicitly cast to prevent 'void *' dereference.
2009-03-13 10:51:11 -07:00
8206ed9aea
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-03-12 10:39:00 -07:00
4d0f64844d
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-03-12 10:38:59 -07:00
Brian Behlendorf