98c6ae53c8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-28 22:25:41 -07:00
b41143632b
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
cmd/zpool/zpool_vdev.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
lib/libzpool/include/sys/zfs_context.h
module/zcommon/include/sys/fs/zfs.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_send.c
module/zfs/dmu_tx.c
module/zfs/dsl_dataset.c
module/zfs/dsl_dir.c
module/zfs/dsl_scrub.c
module/zfs/fm.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/fm/fs/zfs.h
module/zfs/include/sys/fm/protocol.h
module/zfs/include/sys/spa.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/include/sys/zvol.h
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/spa_history.c
module/zfs/spa_misc.c
module/zfs/txg.c
module/zfs/vdev.c
module/zfs/zfs_fm.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zfs_znode.c
module/zfs/zil.c
module/zfs/zio.c
2010-05-28 22:14:39 -07:00
812761eac5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-05-28 15:46:10 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
7733d3b4c6
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-23 10:07:03 -07:00
8aa7455978
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-23 10:04:22 -07:00
fd6bf51a0a
Use more correct /usr/bin/awk patch for default.
2010-05-23 09:57:05 -07:00
343bcf823f
Refresh autogen products with automake 1.11.1
2010-05-21 16:04:53 -07:00
233c86a30a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 16:24:57 -07:00
437789841d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-18 16:22:46 -07:00
d28ada9eaa
Remove explicit import from zconfig test 1.
...
Due to now resolved bug in the SPL you would need to explicitly
import you zpools after module load. Now that is no longer the case.
If a cache file is found your pool will be automatically loaded and
available so I'm removing the explicit imports from the test case.
2010-05-18 16:15:57 -07:00
d5c0441641
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-18 15:13:53 -07:00
cf07f0acd5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-18 15:12:33 -07:00
3a8dbc184a
Move zpios script change to correct linux-zpios branch.
2010-05-18 15:06:37 -07:00
4e7fd8ff9d
Move build system and core script changes to correct zfs-branch.
2010-05-18 15:05:44 -07:00
ecb8603d26
Revert changes which don't belong on linux-configure-branch.
2010-05-18 15:04:19 -07:00
43afa9e1d4
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-04-29 12:06:40 -07:00
9dc83e5f34
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-04-29 12:06:04 -07:00
fa60ee8c86
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-04-29 12:04:39 -07:00
66ba722b0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:04:36 -07:00
3affbe6d7e
Update nvpair's to include nv_alloc_fixed support
2010-04-29 11:59:41 -07:00
a45a62d1a2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-04-29 10:44:02 -07:00
50cf137f41
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-04-29 10:43:27 -07:00
91b582d4a1
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-04-29 10:42:02 -07:00
1368594e11
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 10:41:59 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
34edbcd956
Refresh autogen products
2010-03-26 15:57:19 -07:00
5421d05a48
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-11 14:10:36 -08:00
eb7888a1eb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-11 14:09:58 -08:00
b0436b0a97
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-11 14:08:33 -08:00
feee765f99
Remove promise example config replace with a supermicro config
...
The promise config never worked quite right. I'm replacing it with
a Supermicro config which does and which I've tested on a real test
system.
2010-03-11 14:04:12 -08:00
e7b3766a69
Remove udev dependency when running in-tree
...
After much contemplation I can't see a clean way to use udev entirely
in-tree for testing. This patch removed a horrible horrible hack which
would copy the needed udev bits in to place on your system to make it
work. That however is simply not acceptable, nothing you in in-tree
should ever ever ever install something on your system.
Since I could not come up with a clean way to use udev in-tree. The
fix is to simply parse the zdev config file and create the needed
symlinks in a sub-diretory or your working tree. This is not as clean
as using udev but it does work perfectly well for in-tree testing.
2010-03-11 13:56:20 -08:00
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -08:00
68b657e394
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-03-09 14:56:34 -08:00
037d965f04
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 14:56:01 -08:00
17c7323211
Fix scripts to work when invoked from other directories.
2010-03-09 14:51:49 -08:00
4853ac3d53
Fix scripts to work when invoked from other directories.
2010-03-09 14:50:15 -08:00
02d15b4e4f
Refresh autogen products
2010-03-08 10:57:16 -08:00
98ae569641
Refresh autogen products
2010-03-02 10:17:58 -08:00
cdc2e52139
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
...
Conflicts:
scripts/udev-rules/99-zpool.rules.dragon
2010-03-02 10:08:59 -08:00
06d354b4f3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
cmd/Makefile.am
2010-03-02 10:06:26 -08:00
e6d92ae57d
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/Makefile.am
2010-03-02 10:01:51 -08:00
7df02c0f57
Split the udev rule from a specific configuration
...
While I completely agree the udev is the lesser of many possibles
evils when solving the device issue... it is still evil. After
attempting to craft a single rule which will work for various
versions of udev in various distros. I've come to the conclusion
the only maintainable way to solve this issue is to split the rule
from any particular configuration.
This commit provides a generic 60-zpool.rules file which use a
small helper util 'zpool_id' to parse a configuration file by
default located in /etc/zfs/zdev.conf. The helper script maps
a by-path udev name to a more friendly name of <channel><rank>
for large configurations.
As part of this change all of the support scripts why rely on
this udev naming convention have been updated as needed. Example
zdev.conf files have also been added for 3 different systems by
you will always need to add one for your exact hardware.
Finally, included in these changes are the proper tweaks to the
build system to ensure everything still get's packaged properly
in the rpms and can run in or out of tree.
2010-03-01 16:51:21 -08:00
2d43af054e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-01-08 10:26:41 -08:00
0e63df30fe
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-01-08 10:26:22 -08:00
6dba7c4354
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-01-08 10:25:37 -08:00
e0aff96a14
Use udevadm if available otherwise use udevtrigger/udevsettle
...
Moving forward udevadm {trigger/settle} replaced udevtrigger/udevsettle
as the correct interface to use. However, since we need to work in
both environments for testing check and see if udevadm is available.
If it is then use it. If it is not fall back to the legacy interface.
2010-01-08 10:20:03 -08:00
9b473082fa
Refresh autogen products
2009-12-23 14:53:51 -08:00
64f8a4c314
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-12-11 16:24:16 -08:00
4fdebcdb85
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-11 16:23:43 -08:00
Brian Behlendorf
Ricardo M. Correia