Brian Behlendorf
223aac31be
Refresh autogen products.
2009-10-06 12:32:47 -07:00
Brian Behlendorf
4f89a1ce7a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-06 12:31:09 -07:00
Brian Behlendorf
a4a2726d2a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-10-06 12:29:44 -07:00
Brian Behlendorf
e22d671281
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-06 12:26:00 -07:00
Brian Behlendorf
5d4c60fabe
Use alternate /etc/zfs/zpool.cache file for in-tree tests
...
Pass an alternate location via module option for the zpool.cache file
used by the kernel. This allows us to write in-tree tests which do
not modify any out-of-tree files we do not own. This is just standard
good behavior for any test suite.
Additionally, refine the existing test case to explicity use the cache
file when looking for pools to import. And add a second test cache
which is forced to probe the disks for available pools to import.
2009-10-06 12:12:05 -07:00
Brian Behlendorf
8bc91a2ae6
Refresh autogen products
2009-10-01 17:11:35 -07:00
Brian Behlendorf
93f4668b9e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-01 17:10:24 -07:00
Brian Behlendorf
e02d23d347
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
scripts/Makefile.am
2009-10-01 17:09:38 -07:00
Brian Behlendorf
8d3df842d1
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
scripts/Makefile.am
2009-10-01 17:05:55 -07:00
Brian Behlendorf
0efea24e73
Add zconfig.sg test script.
...
This is an initial script for validation of zfs/zpool configuration.
For now there is only one test here to ensure that /etc/zfs/zpool.cache
is being updated properly from the kernel module. Additional tests
should be added, I believe Richardo said there was an existing test
suite out there which validated the behavior of many zpool/zfs commands.
It would be nice to add that as appropriate.
2009-10-01 16:55:34 -07:00
Brian Behlendorf
3bf69e0905
Refresh autogen products
2009-08-18 14:59:40 -07:00
Brian Behlendorf
639e2364bf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-18 14:55:22 -07:00
Brian Behlendorf
af90397fbc
Move ZPIOS chunk to linux-zpios topic branch
2009-08-18 14:48:25 -07:00
Brian Behlendorf
aeef1cf6e9
Refresh autogen products
2009-08-18 14:45:04 -07:00
Brian Behlendorf
92bb246ab4
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-18 14:22:55 -07:00
Brian Behlendorf
cd710627dd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-18 14:21:47 -07:00
Brian Behlendorf
147adbe815
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-18 14:18:40 -07:00
Brian Behlendorf
5b4a08d0f4
Move ZPIOS chunk to linux-zpios topic branch
2009-08-18 14:06:05 -07:00
Brian Behlendorf
ddda617645
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-18 10:51:30 -07:00
Brian Behlendorf
38f5d8fd54
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-18 10:51:10 -07:00
Brian Behlendorf
48dae5b818
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-18 10:50:17 -07:00
Brian Behlendorf
adc7bb76f2
Add 3 dragon drawer test configurations (raid0, raidz, raidz2).
...
The current test rig consists of two 60 disk dragon drawers in configured
in 4-x15 mode. Each drawer has 4 SAS connections to my node for a total
of 8 SAS connections spread over 4 dual-port LSI SAS adapters. The
configures are as follows:
- raid0: All 120 drives in a single pool.
- raidz: 15 RAIDZ groups of 7+1.
- raidz2: 15 RAIDZ2 groups of 6+2.
2009-08-18 10:40:30 -07:00
Brian Behlendorf
1f8a43f7a2
Refresh autogen products
2009-08-17 21:58:33 -07:00
Brian Behlendorf
49be3a6efa
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-17 21:57:04 -07:00
Brian Behlendorf
8e954086b9
Add zpios scripts to zfs-test package test infrastructure.
...
This change extends the existing in-tree test infrastructure such
that it can also be run as part of a the installed package. This
simplifies testing on multiple systems and is generally all around
useful. The scripts may still be run in-tree and will use the
in-tree build products as long as .script-config exists.
2009-08-17 21:50:55 -07:00
Brian Behlendorf
89d97ddfc9
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-08-17 21:47:54 -07:00
Brian Behlendorf
48107741cd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
configure.ac
scripts/Makefile.am
2009-08-17 21:46:51 -07:00
Brian Behlendorf
2af51466af
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
configure.ac
scripts/Makefile.am
2009-08-17 21:41:45 -07:00
Brian Behlendorf
4f555da51d
Add zfs-test package which includes test infrastructure.
...
This change extends the existing in-tree test infrastructure such
that it can also be run as part of a the installed package. This
simplifies testing on multiple systems and is generally all around
useful. The scripts may still be run in-tree and will use the
in-tree build products as long as .script-config exists.
2009-08-17 21:35:06 -07:00
Brian Behlendorf
535dab57d2
Refresh autogen products.
2009-07-29 17:54:49 -07:00
Brian Behlendorf
087b16f9f7
Refresh autogen products
2009-07-27 10:52:57 -07:00
Brian Behlendorf
198180fdd2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-27 10:51:34 -07:00
Brian Behlendorf
49d045e35d
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-27 10:50:31 -07:00
Brian Behlendorf
c7384d6b2e
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-27 10:47:31 -07:00
Brian Behlendorf
3a431c68c2
Remove LINUXINCLUDE from autoconf wrapper, breaks 2.6.28+ kernels.
...
Modern kernel build systems at least post 2.6.16 will set this properly
so we should not. In fact post 2.6.28 the include headers have moved
under arch so the guess we make here is completely wrong. Letting
the kernel build system set this ensure it will be correct. Also
drop the ulimit from the Makefile which, not surprisingly, turns out
to be very non-portable. If your expecting failures set the ulimit
in your shell before kicking off the test suite.
2009-07-27 10:39:28 -07:00
Brian Behlendorf
bc5b337a6b
Refresh autogen products
2009-07-24 16:08:39 -07:00
Brian Behlendorf
9e3a99a18d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-24 16:08:03 -07:00
Brian Behlendorf
518a89550a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
scripts/Makefile.am
2009-07-24 16:04:26 -07:00
Brian Behlendorf
5ecd180d91
ulimit is a function of the shell and should be invoked as such.
2009-07-24 15:50:57 -07:00
Brian Behlendorf
7eee2fbe15
Refresh autogen products
2009-07-24 15:33:32 -07:00
Brian Behlendorf
40cad03c51
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-24 11:18:03 -07:00
Brian Behlendorf
96a05001c1
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
scripts/Makefile.am
2009-07-24 11:16:47 -07:00
Brian Behlendorf
430d6004e5
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
scripts/Makefile.am
2009-07-24 11:10:21 -07:00
Ricardo M. Correia
08d148d418
Add ulimit -c unlimited before running ztest, to get a core dump.
...
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-07-24 10:58:55 -07:00
Brian Behlendorf
fa5f870580
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-24 10:37:14 -07:00
Brian Behlendorf
08c9bcde74
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-24 10:36:00 -07:00
Brian Behlendorf
a66be0122f
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-24 10:32:50 -07:00
Brian Behlendorf
710c21f2e9
Use LOSETUP variable for all calls to /sbin/losetup
2009-07-24 10:25:01 -07:00
Brian Behlendorf
dba29a5097
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-24 09:20:01 -07:00
Brian Behlendorf
75ddd265cb
Remove a stray | in the zpios-survey script which caused it to fail.
2009-07-24 08:50:05 -07:00
Brian Behlendorf
67624a608d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-21 17:15:42 -07:00
Brian Behlendorf
154612b330
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-21 17:14:43 -07:00
Brian Behlendorf
e85aaac131
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-21 17:11:47 -07:00
Brian Behlendorf
bc8c87d2f3
Missed one instance of losetup -f to unused_loop_device change
2009-07-21 17:05:13 -07:00
Brian Behlendorf
29425ec461
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-21 16:33:18 -07:00
Brian Behlendorf
8e5f7bd9d5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-21 16:32:18 -07:00
Brian Behlendorf
4988767d65
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-21 16:29:25 -07:00
Brian Behlendorf
b9c3c7a2f4
The losetup -f option is unavailable for SLES10 use unused_loop_device()
...
SLES10 ships util-linux-2.12r-35.30 which does not support the -f option
to losetup. To avoid this problem the unused_loop_device() function was
added which attempts to find an unused loop device by checking each
/dev/loop* device with losetup to see if it is configured.
2009-07-21 16:17:54 -07:00
Brian Behlendorf
8e8b9b1816
Refresh autogen products
2009-07-21 14:54:30 -07:00
Brian Behlendorf
24f0f6da93
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-21 14:52:49 -07:00
Brian Behlendorf
efb9868b69
Pretty-up the 'make check' output
...
Reasonable output from 'make check' now looks roughly like this. The
big change is the consolidation of the all the zpion test results in
to a single table which can be easily scanned for failures/problems.
==================================== ZTEST ====================================
5 vdevs, 7 datasets, 23 threads, 300 seconds...
Pass 1, SIGKILL, 1 ENOSPC, 13.8% of 238M used, 17% done, 4m07s to go
Pass 2, SIGKILL, 1 ENOSPC, 23.7% of 238M used, 38% done, 3m04s to go
Pass 3, SIGKILL, 0 ENOSPC, 27.0% of 238M used, 66% done, 1m42s to go
Pass 4, SIGKILL, 0 ENOSPC, 27.4% of 238M used, 75% done, 1m14s to go
Pass 5, SIGKILL, 0 ENOSPC, 27.9% of 238M used, 89% done, 32s to go
Pass 6, Complete, 0 ENOSPC, 14.0% of 476M used, 100% done, 0s to go
5 killed, 1 completed, 83% kill rate
==================================== ZPIOS ====================================
status name id wr-data wr-ch wr-bw rd-data rd-ch rd-bw
-------------------------------------------------------------------------------
PASS: file-raid0 0 64m 64 13.04m 64m 64 842.22m
PASS: file-raid10 0 64m 64 134.19m 64m 64 842.22m
PASS: file-raidz 0 64m 64 87.56m 64m 64 853.45m
PASS: file-raidz2 0 64m 64 134.19m 64m 64 853.45m
PASS: lo-raid0 0 64m 64 429.59m 64m 64 14.63m
PASS: lo-raid10 0 64m 64 397.57m 64m 64 771.19m
PASS: lo-raidz 0 64m 64 206.48m 64m 64 688.27m
PASS: lo-raidz2 0 64m 64 14.34m 64m 64 711.21m
2009-07-21 14:41:35 -07:00
Brian Behlendorf
8feebe7d65
Refresh autogen products
2009-07-16 10:29:59 -07:00
Brian Behlendorf
78cb1bf653
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-10 11:54:17 -07:00
Brian Behlendorf
379941cb58
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-10 11:52:55 -07:00
Brian Behlendorf
dd51c10883
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-10 11:48:59 -07:00
Brian Behlendorf
e16ffab302
SPLBUILD now includes modules
2009-07-10 11:37:30 -07:00
Brian Behlendorf
8283120116
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-06 17:01:47 -07:00
Brian Behlendorf
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
Brian Behlendorf
e3d5b2a900
Refresh autogen products
2009-07-01 11:37:26 -07:00
Brian Behlendorf
80cfd98d8e
Refresh autogen products
2009-06-09 16:46:26 -07:00
Brian Behlendorf
26f70525ee
Refresh autogen products
2009-06-08 16:33:33 -07:00
Brian Behlendorf
04621618cf
Refresh autogen products
2009-03-18 15:05:35 -07:00
Brian Behlendorf
e61fa20d11
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-18 14:40:31 -07:00
Brian Behlendorf
b46037b53f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-03-18 14:39:07 -07:00
Brian Behlendorf
c6ddce0341
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-03-18 14:31:53 -07:00
Brian Behlendorf
70407622a7
Move `make check` ztest under ./scripts where the module stack is loaded.
2009-03-18 14:19:04 -07:00
Brian Behlendorf
7fa1ced508
Refresh autogen products, remove stray zdump Makefile.in
2009-03-12 16:48:12 -07:00
Brian Behlendorf
0fe418c548
Refresh autogen products
2009-03-12 15:55:23 -07:00
Brian Behlendorf
e1b736ecc8
Refresh autogen products
2009-03-10 11:42:01 -07:00
Brian Behlendorf
1efe435474
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-20 22:32:34 -08:00
Brian Behlendorf
a31814f47b
Further profile infrastructure
2009-02-20 22:27:18 -08:00
Brian Behlendorf
986591a09a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-20 14:33:30 -08:00
Brian Behlendorf
4d28f29b6c
Update profile scripts with additional upcalls for fine grained profiling
2009-02-20 14:28:00 -08:00
Brian Behlendorf
2c7ad95794
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-19 14:57:33 -08:00
Brian Behlendorf
ddfa570f42
Initial update to support zpios.sh profiling option.
2009-02-19 14:51:40 -08:00
Brian Behlendorf
7f38c76b46
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-06 15:30:40 -08:00
Brian Behlendorf
9b649b23ef
Minor update to ensure heads make it in to the log
2009-02-06 15:28:49 -08:00
Brian Behlendorf
31ea8d7dac
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-06 15:10:43 -08:00
Brian Behlendorf
a06c9a3bd9
Add 2 more zpios test configurations
2009-02-06 15:08:15 -08:00
Brian Behlendorf
4c927e213a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-06 15:02:54 -08:00
Brian Behlendorf
29b6072595
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-06 15:02:29 -08:00
Brian Behlendorf
4bb45ceef2
Update zpios survey script to use new scripts
2009-02-06 14:58:31 -08:00
Brian Behlendorf
3c9fa95530
Add 2 new args for zpool_create to take extra args
2009-02-06 14:57:37 -08:00
Brian Behlendorf
e47bda4086
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-06 11:52:21 -08:00
Brian Behlendorf
1d0f2ef9e2
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-06 11:51:57 -08:00
Brian Behlendorf
df7399e08b
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-06 11:50:28 -08:00
Brian Behlendorf
97e40aae09
Add 8 basic x4550 configurations which are of interest.
2009-02-06 11:47:09 -08:00
Brian Behlendorf
261a715644
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-02-03 09:30:32 -08:00
Brian Behlendorf
59008dc2b2
Updated script to actually make name
2009-02-03 09:28:19 -08:00
Brian Behlendorf
e61d9fdd2e
Refresh autogen products
2009-01-26 19:02:55 -08:00
Brian Behlendorf
4faa475094
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-26 17:05:47 -08:00
Brian Behlendorf
822b9d99ab
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-26 17:05:06 -08:00
Brian Behlendorf
0f54a996b3
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-26 17:02:41 -08:00
Brian Behlendorf
9e6f35e5cf
Add loopback based test configs
2009-01-26 16:59:02 -08:00
Brian Behlendorf
13a81ba014
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 21:38:32 -08:00
Brian Behlendorf
28dd8ef8b9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 21:38:07 -08:00
Brian Behlendorf
39fe5b1cf9
Minor script fixes
2009-01-20 21:34:29 -08:00
Brian Behlendorf
9991894b21
Minor script fix
2009-01-20 21:34:09 -08:00
Brian Behlendorf
66db92c86f
Refresh autogen products
2009-01-20 21:14:51 -08:00
Brian Behlendorf
8562f0355e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 21:11:32 -08:00
Brian Behlendorf
623125820d
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 21:10:42 -08:00
Brian Behlendorf
9094c3a1fc
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 21:07:46 -08:00
Brian Behlendorf
15c9eb903f
Add 4 basic file based testr configs
2009-01-20 21:03:02 -08:00
Brian Behlendorf
564dcf1adf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 17:05:53 -08:00
Brian Behlendorf
2f0f133d97
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 17:04:55 -08:00
Brian Behlendorf
cebdbdf440
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 17:02:03 -08:00
Brian Behlendorf
40c5baafa2
Add file based config, and update the lo config to use real loopback devices, interestingly this currently fails
2009-01-20 16:57:45 -08:00
Brian Behlendorf
b4365b87b4
Refresh autogen products
2009-01-20 16:01:52 -08:00
Brian Behlendorf
b47904cfce
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 15:56:57 -08:00
Brian Behlendorf
2334ba2bb1
Add a script scripts, update Makefiles
2009-01-20 15:54:50 -08:00
Brian Behlendorf
f927ee3245
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 15:48:20 -08:00
Brian Behlendorf
67d3177f05
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 15:47:55 -08:00
Brian Behlendorf
1996f04880
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 15:46:31 -08:00
Brian Behlendorf
26d0de9a92
Update Makefiles for recent script updates
2009-01-20 15:43:21 -08:00
Brian Behlendorf
ce9376bfd0
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 15:39:30 -08:00
Brian Behlendorf
f146db30ba
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 15:39:06 -08:00
Brian Behlendorf
af43246767
Minor script cleanup
2009-01-20 15:34:38 -08:00
Brian Behlendorf
e125a95615
Minor script cleanup
2009-01-20 15:34:02 -08:00
Brian Behlendorf
cac715ea81
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 14:34:10 -08:00
Brian Behlendorf
eb205c6e62
Update zpios to use zpool-create -d arg, and zpios-start/stop
2009-01-20 14:32:02 -08:00
Brian Behlendorf
ffbf23b8c8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 14:18:44 -08:00
Brian Behlendorf
5fb57391c8
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 14:18:21 -08:00
Brian Behlendorf
bd11623ed8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 14:17:03 -08:00
Brian Behlendorf
5ae334d138
Use .sh extension
2009-01-20 14:15:05 -08:00
Brian Behlendorf
6e5a963b38
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-20 14:14:17 -08:00
Brian Behlendorf
2c886c6b7a
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-20 14:13:54 -08:00
Brian Behlendorf
d163810def
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-20 14:12:33 -08:00
Brian Behlendorf
db210bf236
Add destroy functionality to zpool create, needed for generic use by zpios.sh
2009-01-20 14:10:30 -08:00
Brian Behlendorf
a1b9f5596b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 15:09:25 -08:00
Brian Behlendorf
7ac621f98b
Update zpios usage
2009-01-16 15:07:30 -08:00
Brian Behlendorf
2af42007b5
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 15:00:44 -08:00
Brian Behlendorf
81a6dfd781
Minor cleanup, module unload
2009-01-16 14:58:48 -08:00
Brian Behlendorf
1d4ad2d62e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 14:56:15 -08:00
Brian Behlendorf
188291aa77
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-16 14:55:53 -08:00
Brian Behlendorf
cf839c012a
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-16 14:54:34 -08:00
Brian Behlendorf
5bf49743a6
Add minor root check for convenience
2009-01-16 14:51:52 -08:00
Brian Behlendorf
1ede1f1f93
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-16 14:33:21 -08:00
Brian Behlendorf
e77bb8debf
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-16 14:32:59 -08:00
Brian Behlendorf
681d703126
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-16 14:31:41 -08:00
Brian Behlendorf
6a6da5a14d
Minor verbage cleanup
2009-01-16 14:29:31 -08:00