Commit Graph

3211 Commits

Author SHA1 Message Date
Ricardo M. Correia f1c8b3a435 Fix duplicate uuid_t typedef.
This typedef is being done in both lib/libefi/include/sys/uuid.h and
/usr/include/uuid/uuid.h, both of which are included in lib/libefi/rdwr_efi.c.

This leads to the following error:

In file included from ../../lib/libefi/include/sys/efi_partition.h:29,
                 from ../../lib/libefi/rdwr_efi.c:41:
../../lib/libefi/include/sys/uuid.h:81: error: redefinition of typedef 'uuid_t'
/usr/include/uuid/uuid.h:19: note: previous declaration of 'uuid_t' was here

The reason that we didn't see this before, is because of a strange feature in
gcc where some types of warnings/errors are silently ignored if they come from
system headers. But depending on the order of how system headers end up
included, libefi's uuid.h may actually be included after uuid/uuid.h, which
leads to the error above.

It is safe to remove this duplicate typedef because we are already
dependent on the linux uuid.h header and it's exceptionally unlikely
they will ever change the size.
2010-03-09 13:38:55 -08:00
Brian Behlendorf 26b2ec2cd9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-09 13:25:36 -08:00
Brian Behlendorf 19eef8ad39 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-03-09 13:24:30 -08:00
Brian Behlendorf 9fa502c50b Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-03-09 13:24:29 -08:00
Brian Behlendorf e218fd13e8 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-03-09 13:24:28 -08:00
Brian Behlendorf ef359aee66 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-03-09 13:24:27 -08:00
Brian Behlendorf f2ab1fea36 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-03-09 13:24:27 -08:00
Ricardo M. Correia 2b85024275 Use CPU percentages for number of commit cb threads.
This doesn't change number of threads in the kernel, but it reduces number of
threads in ztest (important due to 32-bit address limitations).
2010-03-09 13:21:20 -08:00
Brian Behlendorf 4b2b113239 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-09 12:31:18 -08:00
Brian Behlendorf 8f63d438cd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-03-09 12:30:18 -08:00
Brian Behlendorf 48e74ed68b Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
Brian Behlendorf 9a3d5378c6 Clean up emulation of kernel threads in userspace.
Updated to use pthread thread specific data rather than keeping
a global list.  This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08:00
Brian Behlendorf 41516067cf Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-09 10:31:26 -08:00
Brian Behlendorf 3a9850385c Include all headers regardless of depth
The previous hack for this was to move headers 3 levels deep in to
the top level include dir and headers 4 levels deep in to sys.
Obviously this was fairly limiting and missed two important headers.

  ./zfs/include/sys/fm/fs/zfs.h
  ./zfs/include/sys/fs/zfs.h

This patch updates the code to be smarter and installs all the headers
to the correct location regardless of depth.  Each header will have its
leading 3 path args stripped (i.e. ./zfs/include/) and replaced with
the correct install destination.  All path information past the first
three levels will be preserved.
2010-03-09 10:20:34 -08:00
Brian Behlendorf a32466bfde Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-08 16:24:19 -08:00
Brian J. Murrell 835a21a54a Fix definitions for the unknown distro/installation
If the distro/installation really is unsupported (i.e. unknown) we should
not make it look like a known distribution (i.e. RHEL) complete with
dependencies on other RPMs and trying to find kenrel source in the RH
standard location.
2010-03-08 16:20:20 -08:00
Brian Behlendorf 30ea25d8c6 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-08 16:08:45 -08:00
Brian J. Murrell 3f30f74414 Check for spl in ../spl if not found in install path
If the spl source could not be found in /usr/src/spl-*, also try to
find it in ../spl.  This makes finding it in a development sandbox
more natural.
2010-03-08 16:04:25 -08:00
Brian Behlendorf 7b42e72288 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-08 14:57:41 -08:00
Brian J. Murrell 0ec3b7e122 When no kernel source has been pointed to, first attempt to use
/lib/modules/$(uname -r)/source.  This will likely fail when building
under a mock (http://fedoraproject.org/wiki/Projects/Mock) chroot
environment since `uname -r` will report the running kernel which
likely is not the kernel in your chroot.  To cleanly handle this
we fallback to using the first kernel in your chroot.

The kernel-devel package which contains all the kernel headers and
a few build products such as Module.symver{s} is all the is required.
Full source is not needed.
2010-03-08 14:53:13 -08:00
Brian Behlendorf 3b738181c3 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-08 13:48:34 -08:00
Brian Behlendorf 3d7cfde000 Remove Module.markers and Module.symver{s} in clean target
Split 'modules' and 'clean' Makefile targets to allow us to
cleanly remove the Module.* build products with a 'make clean'.
2010-03-08 13:45:51 -08:00
Brian Behlendorf 060f2d598b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-08 10:52:15 -08:00
Brian Behlendorf fd7578215e Configure checks for kernel build options incompatible with the license
Twice now I've been bitten by building agaist a kernel which is
configured such that it is incompatible with the CDDL license.  These
build failures don't occur until the linking phase at which point they
simply callout the offending symbol.  No location information can be
provided at this point so it often can be confusing what the problem is
particularly when building against a new kernel for the first time.

To help address this I've added a configure check which can be extended
over time to detect known kernel config options which if set will break
the ZFS build.  Currently I have just added CONFIG_DEBUG_LOCK_ALLOC which
makes mutex's GPL-only and is on by default in the RHEL6 alpha builds.
I know for a fact there are other similiar options which can be added
as they are encountered.
2010-03-08 10:27:42 -08:00
Brian Behlendorf 44d8092c2c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-02 10:05:09 -08:00
Brian Behlendorf 7df02c0f57 Split the udev rule from a specific configuration
While I completely agree the udev is the lesser of many possibles
evils when solving the device issue... it is still evil.  After
attempting to craft a single rule which will work for various
versions of udev in various distros.  I've come to the conclusion
the only maintainable way to solve this issue is to split the rule
from any particular configuration.

This commit provides a generic 60-zpool.rules file which use a
small helper util 'zpool_id' to parse a configuration file by
default located in /etc/zfs/zdev.conf.  The helper script maps
a by-path udev name to a more friendly name of <channel><rank>
for large configurations.

As part of this change all of the support scripts why rely on
this udev naming convention have been updated as needed.  Example
zdev.conf files have also been added for 3 different systems by
you will always need to add one for your exact hardware.

Finally, included in these changes are the proper tweaks to the
build system to ensure everything still get's packaged properly
in the rpms and can run in or out of tree.
2010-03-01 16:51:21 -08:00
Brian Behlendorf 60c9121dd2 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-01-08 11:40:14 -08:00
Brian Behlendorf 303d9f010d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-01-08 11:39:31 -08:00
Brian Behlendorf 710e779a08 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-01-08 11:39:30 -08:00
Brian Behlendorf efd53d2969 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-01-08 11:39:30 -08:00
Brian Behlendorf 75bc637b6d Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-01-08 11:39:30 -08:00
Brian Behlendorf b991553702 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-01-08 11:39:30 -08:00
Brian Behlendorf a240c39095 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-01-08 11:39:29 -08:00
Brian Behlendorf ee3aa7773b Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-01-08 11:39:28 -08:00
Brian Behlendorf eaf2e3231c Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-01-08 11:39:28 -08:00
Brian Behlendorf 27ae099e65 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-01-08 11:39:27 -08:00
Brian Behlendorf d285c096c9 Merge branch 'fix-acl' into refs/top-bases/fix-branch 2010-01-08 11:39:27 -08:00
Brian Behlendorf cad00c2fc1 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-01-08 11:39:27 -08:00
Brian Behlendorf da35bd5b60 Merge commit 'refs/top-bases/fix-acl' into fix-acl 2010-01-08 11:39:26 -08:00
Brian Behlendorf 050c1617d8 Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode 2010-01-08 11:39:26 -08:00
Brian Behlendorf 3d5d35b616 Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2010-01-08 11:39:26 -08:00
Brian Behlendorf 34c0ae76d9 Merge commit 'refs/top-bases/fix-strncat' into fix-strncat 2010-01-08 11:39:25 -08:00
Brian Behlendorf fe9ad9171a Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2010-01-08 11:39:25 -08:00
Brian Behlendorf 4d11d8d3ef Merge commit 'refs/top-bases/fix-list' into fix-list 2010-01-08 11:39:24 -08:00
Brian Behlendorf 4fc3a7710c Merge branch 'fix-list' into refs/top-bases/fix-branch 2010-01-08 11:39:24 -08:00
Brian Behlendorf 259647c1f1 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-01-08 11:39:23 -08:00
Brian Behlendorf 6ef95d5968 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-01-08 11:39:23 -08:00
Brian Behlendorf 233a1d9191 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2010-01-08 11:39:23 -08:00
Brian Behlendorf 385839654a Merge commit 'refs/top-bases/fix-stack' into fix-stack 2010-01-08 11:39:22 -08:00
Brian Behlendorf 5bd6eac343 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2010-01-08 11:39:22 -08:00