f78b777004
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-11-12 12:56:27 -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
ed1377a7e3
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-11-02 15:10:43 -08:00
a75cfcd5eb
Add e2fsprogs patch for detecting ZFS uberblocks until it appears upstream.
2009-11-02 15:04:43 -08:00
5dacb1d767
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-11-02 14:16:31 -08:00
31a5ad7c9d
Add missing zconfig.sh test script to package.
2009-11-02 14:09:23 -08:00
6a3f2e1eb0
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-11-02 13:10:09 -08:00
1911adb241
Prep for 0.4.6 tag, updated META, ChangeLog, and TODO.
2009-11-02 13:03:59 -08:00
d624508c99
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-27 15:04:13 -07:00
2d70e6fd91
Update scripts to cleanup better when setup failures occur
2009-10-27 14:31:31 -07:00
395efeea02
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-26 10:49:53 -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
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
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
53fcde4a48
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-10-23 12:24:37 -07:00
d8d360724d
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-10-23 12:24:37 -07:00
5972702242
Add two more possible uninit vars flagged by gcc.
2009-10-23 11:43:09 -07:00
8545c1c447
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-21 12:04:32 -07:00
5bf14d3400
Update zpool-configs to be udev aware.
...
To simplify creation and management of test configurations the
dragon and x4550 configureis have been integrated with udev. Our
current best guess as to how we'll actually manage the disks in
these systems is with a udev mapping scheme. The current leading
scheme is to map each drive to a simpe <CHANNEL><RANK> id. In
this mapping each CHANNEL is represented by the letters a-z, and
the RANK is represented by the numbers 1-n. A CHANNEL should
identify a group of RANKS which are all attached to a single
controller, each RANK represents a disk. This provides a nice
mechanism to locate a specific drive given a known hardware
configuration. Various hardware vendors use a similar scheme.
A nice side effect of these changes is it allowed me to make
the raid0/raid10/raidz/raidz2 setup functions generic. This
makes adding new test configs easy, you just need to create
a udev rules file for your test config which conforms to the
naming scheme.
2009-10-21 11:38:51 -07:00
7190c77120
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-15 16:45:41 -07:00
a09d33e929
Update build system for libblkid integration
2009-10-15 16:25:18 -07:00
c56b485f66
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-14 15:59:26 -07:00
085ed9fe82
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-14 15:57:10 -07:00
cb678c0b31
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-14 15:57:09 -07:00
9ea3f53d0c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-10-14 15:57:09 -07:00
a8adb61c00
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-10-14 15:57:08 -07:00
09a8c99097
Additional build system update for libefi library.
...
This include updating all the Makefile.am to have the correct
include paths and libraries. In addition, the zlib m4 macro was
updated to more correctly integrate with the Makefiles. And I
added two new macros libblkid and libuuid which will be needed by
subsequent commits for blkid and uuid support respectively. The
blkid support is optional, the uuid support is mandatory for libefi.
2009-10-14 15:47:41 -07:00
39d85a8b94
Remove pragmas from new libefi files.
2009-10-14 15:44:22 -07:00
2fd5a539e9
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-09 16:44:27 -07:00
cb91bbe6ce
Additional set of build system tweaks for libefi library.
2009-10-09 16:37:32 -07:00
caed68da36
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-09 16:13:11 -07:00
a0337cfcd8
Add libefi library in to the build system.
2009-10-09 15:58:45 -07:00
c3b45fe669
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-09 15:45:55 -07:00
e0e0f0ea84
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-09 15:43:33 -07:00
2b2fd27e18
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-10-09 15:43:32 -07:00
ad0f8481d2
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-10-09 15:43:31 -07:00
b60766e22f
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-10-09 15:43:31 -07:00
7698515ec4
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-10-09 15:43:30 -07:00
6df047f11f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-10-09 15:43:30 -07:00
46fa16ed8c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-10-09 15:43:28 -07:00
656d8f6b22
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-10-09 15:43:28 -07:00
46b272f2c4
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-10-09 15:43:25 -07:00
1b7a8f5e26
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-10-09 15:43:24 -07:00
a4c68aa767
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-10-09 15:43:23 -07:00
873470861e
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2009-10-09 15:43:23 -07:00
27c7573a5e
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-10-09 15:43:22 -07:00
6d3da13a7d
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2009-10-09 15:43:21 -07:00
00699175eb
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-10-09 15:43:20 -07:00
69d396e7e0
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-10-09 15:43:20 -07:00
Brian Behlendorf