00f3dfb5e9
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-11-15 16:26:36 -08:00
59cbe87375
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-11-15 16:26:31 -08:00
51bc0df445
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-11-15 16:26:30 -08:00
2bee739b4c
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-11-15 16:26:30 -08:00
13309c929d
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2009-11-15 16:26:29 -08:00
4ef70c783d
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-11-15 16:26:27 -08:00
ed1f75364a
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-11-15 16:26:26 -08:00
d80d6e9bc0
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-11-15 16:26:24 -08:00
123728d9ae
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2009-11-15 16:26:23 -08:00
bb4fcdc504
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-11-15 16:26:21 -08:00
4f9acff2d8
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-11-15 16:26:20 -08:00
7de12fa47e
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-11-15 16:26:19 -08:00
b5e7e8a1de
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-11-15 16:26:17 -08:00
c79a602d88
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-11-15 16:26:16 -08:00
26844cb8e1
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-11-15 16:26:14 -08:00
9bb3ec458b
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-11-15 16:26:13 -08:00
217998d1a3
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-11-15 16:26:12 -08:00
0ba18e9310
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-11-15 16:26:09 -08:00
ecdec2a90d
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-11-15 16:26:08 -08:00
21e5a5ee85
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-11-15 16:26:06 -08:00
56d2a97b3b
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-11-15 16:26:05 -08:00
a1bac081ee
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-11-15 16:26:03 -08:00
109d34244d
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-11-15 16:26:02 -08:00
49468cacf3
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-11-15 16:26:00 -08:00
8338a080a8
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-11-15 16:25:59 -08:00
a26d57f6f7
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-11-15 16:25:57 -08:00
86737ffc6c
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-11-15 16:25:56 -08:00
c2b8421841
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-11-15 16:25:55 -08:00
9d03c28169
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-11-15 16:25:53 -08:00
d8aef5d7bc
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-11-15 16:25:52 -08:00
030d49c262
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-11-15 16:25:50 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
f872f7968a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-11-12 12:56:08 -08:00
9ee04032de
Linux 2.6.31 logical block size compatibility.
...
Autoconf check for bdev_logical_block_size() helper which replaced
bdev_hardsect_size() as the correct way to get the sector size.
2009-11-12 12:49:01 -08:00
62cd69dcea
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-11-02 15:10:14 -08:00
a75cfcd5eb
Add e2fsprogs patch for detecting ZFS uberblocks until it appears upstream.
2009-11-02 15:04:43 -08:00
93c9b626f3
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-11-02 14:16:02 -08:00
31a5ad7c9d
Add missing zconfig.sh test script to package.
2009-11-02 14:09:23 -08:00
2fb231f31a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-11-02 13:09:38 -08:00
1911adb241
Prep for 0.4.6 tag, updated META, ChangeLog, and TODO.
2009-11-02 13:03:59 -08:00
8cfd186d87
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-27 15:03:44 -07:00
a9accbcb57
Always open using O_EXCL to ensure the device is not in use.
...
Allow partition tables on md devices but not dm- devices.
2009-10-27 14:58:12 -07:00
2d70e6fd91
Update scripts to cleanup better when setup failures occur
2009-10-27 14:31:31 -07:00
37a519433c
Add additional clarification for Linux systems to error message.
2009-10-26 10:50:43 -07:00
757cbd422e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-26 10:49:28 -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
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
8a34963bec
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-23 12:28:10 -07:00
74b67983f1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-23 12:24:39 -07:00
edb22b6a3e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-23 12:24:38 -07:00
Brian Behlendorf