795d799358
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 15:50:19 -07:00
4abc33bbe4
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-07 15:50:16 -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
20989cd4f2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:43 -07:00
e49bdb470e
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-06 17:01:42 -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
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
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
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
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
d65102b493
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-06 15:08:57 -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
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
e3d05c97eb
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-06 13:17:32 -07:00
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
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
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
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
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
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
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
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
df388bfc0a
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-01 11:11:48 -07:00
94390a0793
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-01 11:11:27 -07:00
bfa8b02c2c
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-01 11:10:37 -07:00
d4721058bc
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-01 11:10:36 -07:00
8c684c8d85
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-01 11:10:24 -07:00
b44445a8f1
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-01 11:09:33 -07:00
fa91b5d59b
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-01 11:09:31 -07:00
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
26bea36f61
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-06-08 13:24:19 -07:00
2968e197aa
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-06-08 13:24:17 -07:00
737a6ba81a
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-06-08 13:23:40 -07:00
041457706f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-06-08 13:23:35 -07:00
96da8b0db7
Add missing EXPORT_SYMBOL() to dmu_tx_callback_register().
2009-06-08 13:08:14 -07:00
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
9806b5c02b
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-03-20 13:26:18 -07:00
6bf1e782f4
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-20 13:26:16 -07:00
9bee47e648
Export additional txg_* symbols.
2009-03-20 13:17:23 -07:00
f764039e87
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-03-19 21:32:26 -07:00
aee87a5ab6
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-19 21:31:54 -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
cc0a015671
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-03-19 21:30:17 -07:00
Brian Behlendorf