62788ec38a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-28 16:54:48 -07:00
1f1212fc5f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-28 16:52:22 -07:00
1510a95acd
Add splat module to zfs.sh script
...
The splat module is only needed for the spl regression tests.
But if we add it to MODULES then 'zfs.sh -u' will be able to
unload it if needed, The downside if 'zfs.sh' will always
load it but it's overhead is minimal and in a production
setting you'll always be doing a 'modprobe zfs' anyway so
this is really just for testing.
2010-07-28 16:47:30 -07:00
848b738177
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-28 16:47:08 -07:00
b2c62c2caa
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-28 16:47:05 -07:00
1ae7c424cf
Generate common.sh with paths from configure
...
These are the zpios related changes which were part of common.sh.
2010-07-28 16:42:16 -07:00
f454edf52f
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-28 16:41:34 -07:00
cdd1bba311
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
scripts/common.sh.in
2010-07-28 16:39:33 -07:00
9c024583e9
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
scripts/common.sh.in
2010-07-28 16:36:49 -07:00
26e61dd074
Generate common.sh with paths from configure
...
The common.sh script assumed that it was either being run from
in-tree or was installed under /usr/libexec/zfs. If this was
not the case, because of say the default --prefix=/usr/local,
then the paths would be wrong. To fix this common.sh is now
generated from common.sh.in with the correct path information
provided at configure time.
2010-07-28 16:30:45 -07:00
d825659880
Refresh autogen products
2010-07-28 09:49:38 -07:00
641f300534
Refresh autogen products
2010-07-23 11:50:26 -07:00
3992d0811c
Refresh autogen products
2010-07-23 10:48:54 -07:00
5f78450b86
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-17 16:06:27 -07:00
df51ecbf9b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-17 16:05:01 -07:00
b9dd097bab
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-17 16:04:18 -07:00
84f737b448
Only try to unload modules whose use count is 0
...
This avoids errors from zfs.sh -u when, for example, zlib_deflate is in
use by btrfs.
2010-07-17 16:00:54 -07:00
7f41f96626
Refresh autogen products
2010-07-14 10:51:41 -07:00
f0ff2eddbe
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-07-02 12:26:09 -07:00
3af0250f6d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-02 12:26:06 -07:00
45cb33f64f
Ensure devices are always created/removed
...
Devices were only being created at module load time or when a
dataset was created. Similiar devices were not always being
removed at all the correct times. This patch updates all the
places where devices should either be created or removed. I'm
reasonably sure I got them all but if theres a case I missed
we can catch it with a follow up patch.
module load/unload
zfs create/remove
zpool import/export
zpool destroy
This patch also adds a simple regression test to zconfig.sh
to ensure zpool import/export is basically working properly.
This test specifically checks that devices are created
properly, removed after export, created after import, and
removed as a consequence of a zpool destroy.
2010-07-02 12:21:39 -07:00
e5a5693222
Refresh autogen.sh products
2010-06-29 17:05:00 -07:00
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
804b4e0210
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-28 21:42:29 -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
e26975dea8
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-23 10:05:25 -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
ad78a7f826
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-18 16:23:41 -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
Brian Behlendorf
Ned Bass