485ee35cfc
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-26 10:48:57 -07:00
827b8cc4ef
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-26 10:48:52 -07:00
bfd3c7f7d0
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-26 10:48:51 -07:00
0c81aa8d72
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-26 10:48:50 -07:00
7f3e55993c
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-26 10:48:42 -07:00
9643e17a78
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-26 10:48:41 -07:00
c05071f581
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-26 10:48:40 -07:00
0f1eae0369
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-26 10:48:32 -07:00
3e813e0974
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-26 10:48:30 -07:00
5d70c04d32
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-26 10:48:26 -07:00
2b04eeeb6a
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-26 10:48:24 -07:00
680dd74c3c
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-26 10:48:20 -07:00
629598bf9b
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-10-26 10:48:18 -07:00
6d103301db
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-26 10:48:14 -07:00
8d572c1231
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-26 10:48:12 -07:00
5fbb2c1c4e
Test configs for md, dm, and ramdisk style block devices
...
For the sake of completeness we need to validate everything works
well not just on IDE or SCSI drives. But we need to verify a
zpool configured on top of the Linux virtual block devices.
These scripts simply that testing process, and have shown that
while everything is good on top of a ram disk. Right now the
code base panics the kernel when layered on top of either an
md or dm style device. For the moment don't do that.
2009-10-26 10:41:06 -07:00
1a42b319f6
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-23 16:33:22 -07:00
29c9a2518c
Properly handle block devices other the IDE and SCSI disks.
...
Based on the block device type we can expect a specific naming
convention. With this in mind update efi_get_info() to be more
aware of the type when parsing out the partition number. In,
addition be aware that all block device types are not partitionable.
Finally, when attempting to lookup a device partition by appending
the partition number to the whole device take in to account the
kernel naming scheme. If the last character of the device name
is a digit the partition will always be 'p#' instead of just '#'.
2009-10-23 16:25:16 -07:00
8e29b5ee40
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-10-23 12:29:23 -07:00
5abf80d80c
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-10-23 12:29:21 -07:00
0606b493b6
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-10-23 12:29:16 -07:00
74ca5bf341
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-10-23 12:29:14 -07:00
dc181aaf0d
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-10-23 12:29:09 -07:00
a227047d89
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
cmd/zfs/zfs_main.c
2009-10-23 12:29:02 -07:00
9340733eca
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-10-23 12:28:35 -07:00
b9106752d0
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-10-23 12:28:32 -07:00
6057cdc6e1
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-23 12:28:27 -07:00
a37c7f64a0
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-23 12:28:25 -07:00
8668bfb590
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-23 12:28:20 -07:00
0800b2df23
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-10-23 12:28:18 -07:00
e8e3a8ae70
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-23 12:28:12 -07:00
8a34963bec
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-23 12:28:10 -07:00
576d515d07
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-10-23 12:28:05 -07:00
2188dc7f55
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-23 12:28:03 -07:00
1a6c86bffe
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-10-23 12:27:58 -07:00
1c1d1a3fcb
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-10-23 12:27:56 -07:00
14126e76f0
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-23 12:27:50 -07:00
7c87446ab8
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-23 12:27:48 -07:00
12c261e3e3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-23 12:27:42 -07:00
905511438f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-10-23 12:27:41 -07:00
9b253c7d02
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-10-23 12:27:35 -07:00
a80dbfac27
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-23 12:27:33 -07:00
035c422869
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-23 12:27:28 -07:00
96c5798564
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-23 12:27:26 -07:00
3d65c20fa9
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-23 12:27:25 -07:00
de4b36e469
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-23 12:27:16 -07:00
c66219eb6a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-23 12:27:14 -07:00
d55c2a6511
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-23 12:27:13 -07:00
2f3b1e0416
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-23 12:27:04 -07:00
3c70cf68ca
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-23 12:27:02 -07:00
Brian Behlendorf