Commit Graph

1579 Commits

Author SHA1 Message Date
Brian Behlendorf 500e506883 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-05-14 11:01:48 -07:00
Brian Behlendorf 6ae8aa39ab Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-05-14 10:59:57 -07:00
Brian Behlendorf 20ee89f0f2 Add nvpair_alloc_fixed.c in to libnvpair build. 2010-05-14 10:55:02 -07:00
Brian Behlendorf e55a65895a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-05-14 10:44:14 -07:00
Brian Behlendorf 3809bc6ac5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-14 10:44:12 -07:00
Brian Behlendorf 9b8aa5f57e Extend libspl as required for linux FMA integration.
These changes lay some of the ground work for supporting something
similar to FMA event under Solaris.  In particular these changes
add or modify the following areas.

First off an implementation of the gethrestime() function is added
to libspl.  Secondly, the missing type processorid_t has been added.
And finally the lib/libspl/include/sys/fm/{protocol.h|util.h} stub
headers have been removed in favor of updating the full versions
in module/zfs/include/sys/fm/{protocol.h|util.h} to work cleanly
in both user and kernel space.
2010-05-14 10:33:00 -07:00
Brian Behlendorf 02ddf26563 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-04-29 13:15:33 -07:00
Brian Behlendorf 8e870b63d0 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-04-29 13:15:30 -07:00
Brian Behlendorf d6f1146154 Remove changes from linux-have-sysevent to prepare for topic branch removal. 2010-04-29 13:12:25 -07:00
Brian Behlendorf 824c6c437b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-04-29 12:34:06 -07:00
Brian Behlendorf 35afc56620 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-04-29 12:33:39 -07:00
Brian Behlendorf c14cca5c07 Add fm_init/fm_fini stubs for user space FMA update. 2010-04-29 12:25:18 -07:00
Brian Behlendorf 486ef8b62c Refresh autogen products 2010-04-29 11:03:52 -07:00
Brian Behlendorf beb7a03515 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-04-29 11:02:45 -07:00
Brian Behlendorf 0ff721ce5d Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-04-29 11:02:17 -07:00
Brian Behlendorf 208e42ffe6 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-04-29 11:01:23 -07:00
Brian Behlendorf ea12ca13bf Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-04-29 11:01:22 -07:00
Brian Behlendorf 76d877a211 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 11:00:49 -07:00
Brian Behlendorf 4d5d0f9ef5 Include FMA source and headers in build system 2010-04-29 10:55:27 -07:00
Brian Behlendorf 34edbcd956 Refresh autogen products 2010-03-26 15:57:19 -07:00
Brian Behlendorf a235e4b8b9 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-23 14:58:29 -07:00
Brian Behlendorf fb427cf371 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-03-23 14:58:27 -07:00
Brian Behlendorf ee2a998f37 Move zfs_config.h include to command line -include
Remove the few places in the code where zfs_config.h is included.
It is now added to the gcc compile line to ensure the config results
2010-03-23 14:54:00 -07:00
Brian Behlendorf ddb2e7a5c5 Refresh autogen products 2010-03-22 17:01:13 -07:00
Brian Behlendorf 03f51d86b2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-10 12:09:35 -08:00
Brian Behlendorf 20894b4487 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-03-10 12:09:33 -08:00
Brian Behlendorf c7c19c1259 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-03-10 12:09:32 -08:00
Ricardo M. Correia 2c79a2fa6a Fix a few zdb bugs when trying to open a pool
Specifically, the following bugs are fixed in this patch:

1) zdb wasn't getting the correct device size when the vdev is a
block device.  In Solaris, fstat64() returns the device size but
in Linux an ioctl() is needed.

2) We were opening block devices with O_DIRECT, which caused pread64()
to fail with EINVAL due to memory alignment issues.  This was fixed by
the previous umem cache alignment fix in stub implementation to align
objects correctly.  But we still needed to add a check for the error here.

3) We also make sure that we don't try to open a block device in write
mode in userspace.  This shouldn't happen, because zdb opens devices
in read-only mode, and ztest only uses files.
2010-03-10 12:03:48 -08:00
Ricardo M. Correia c557557e4a Add umem_alloc_aligned() and honor cache_align field for umem caches
Under linux we open block devices with O_DIRECT which means we must
provide aligned memory buffers.  This patch adds the needed umem
interfaces or in the case of caches simply honors alignment provided
at cache creation time.
2010-03-10 11:51:43 -08:00
Brian Behlendorf 6663e28c0b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-10 09:59:54 -08:00
Brian Behlendorf 3670186d0a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-03-10 09:59:28 -08:00
Brian Behlendorf 1186ea3781 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-10 09:59:14 -08:00
Brian Behlendorf 724a450233 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-10 09:58:38 -08:00
Brian Behlendorf c1c14c18c8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-10 09:58:37 -08:00
Brian Behlendorf a97cedc2df Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-10 09:58:07 -08:00
Brian Behlendorf 7223b8df33 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-03-10 09:58:04 -08:00
Brian Behlendorf 54cf7ab2bc Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-03-10 09:58:03 -08:00
Brian Behlendorf 166355dcf0 Merge branch 'fix-error-handling' into refs/top-bases/fix-branch 2010-03-10 09:54:43 -08:00
Ricardo M. Correia 62a0ac8f22 Fix some incorrect error handling.
In vn_open(), if fstat64() returned an error, the real errno
was being obscured by calling close().

Add error handling for both pwrite64() calls in vn_rdwr().
2010-03-10 09:53:53 -08:00
Brian Behlendorf f0977a90e1 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-09 13:43:32 -08:00
Brian Behlendorf 6521b99461 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-03-09 13:43:29 -08:00
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 c3240ea0d8 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-09 12:31:56 -08:00
Brian Behlendorf fdab6de381 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-03-09 12:31:32 -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 feac56bf5a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-09 12:30:44 -08:00
Brian Behlendorf 17a96f44f3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-09 12:30:43 -08:00
Brian Behlendorf 573328741b Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2010-03-09 12:30:21 -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