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
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
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
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
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
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
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
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
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
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
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
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
563c0614c4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-16 16:22:19 -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
