Commit Graph

2446 Commits

Author SHA1 Message Date
Brian Behlendorf 4d5d0f9ef5 Include FMA source and headers in build system 2010-04-29 10:55:27 -07:00
Brian Behlendorf 50cf137f41 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 10:43:27 -07:00
Brian Behlendorf 4fde8f52f1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-04-29 10:42:55 -07:00
Brian Behlendorf 9c9f3480ad Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 10:42:47 -07:00
Brian Behlendorf 25aa7e01e3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-04-29 10:42:40 -07:00
Brian Behlendorf 86705eb3e0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-04-29 10:42:39 -07:00
Brian Behlendorf 9c2946732d Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-04-29 10:42:09 -07:00
Brian Behlendorf 91b582d4a1 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 10:42:02 -07:00
Brian Behlendorf 1368594e11 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 10:41:59 -07:00
Brian Behlendorf ca4ad9f284 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-04-29 10:41:56 -07:00
Brian Behlendorf 9199dc112a Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-04-29 10:41:55 -07:00
Brian Behlendorf c97d2c5541 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-04-29 10:41:53 -07:00
Brian Behlendorf 18f485a504 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-04-29 10:41:52 -07:00
Brian Behlendorf 655b4b2b1c Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-04-29 10:41:39 -07:00
Brian Behlendorf dbda9cb8fc Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2010-04-29 10:41:28 -07:00
Brian Behlendorf 86049947d8 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2010-04-29 10:41:24 -07:00
Brian Behlendorf 13668b7879 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-04-29 10:41:23 -07:00
Brian Behlendorf f2ca1d7334 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2010-04-29 10:41:22 -07:00
Brian Behlendorf 34d62da9bc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 10:41:18 -07:00
Brian Behlendorf 986366989f Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2010-04-29 10:41:12 -07:00
Brian Behlendorf d91c81c4df Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-04-29 10:41:09 -07:00
Brian Behlendorf a3c2fb2333 Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2010-04-29 10:41:02 -07:00
Brian Behlendorf 3bd5ecf4a7 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2010-04-29 10:41:00 -07:00
Brian Behlendorf 530d9b5702 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2010-04-29 10:40:57 -07:00
Brian Behlendorf c3da525f25 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2010-04-29 10:40:54 -07:00
Brian Behlendorf 1655c9c76f Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2010-04-29 10:40:51 -07:00
Brian Behlendorf 097e1158e6 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2010-04-29 10:40:48 -07:00
Brian Behlendorf d5dbdb4fe2 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2010-04-29 10:40:38 -07:00
Brian Behlendorf 8c24800b72 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-04-29 10:40:36 -07:00
Brian Behlendorf 4aad8d3244 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-04-29 10:40:34 -07:00
Brian Behlendorf fa42225a3d Add Solaris FMA style support 2010-04-29 10:37:15 -07:00
Brian Behlendorf a608242d71 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-03-22 16:56:41 -07:00
Brian Behlendorf 1a6447c024 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-03-22 16:56:32 -07:00
Brian Behlendorf 38b6b00574 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-22 16:56:30 -07:00
Brian Behlendorf 5b14d2ab2f 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-22 16:50:58 -07:00
Brian Behlendorf c9aaaff23b 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
are always available.
2010-03-22 16:48:16 -07:00
Brian Behlendorf f04c01c945 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-03-09 13:53:21 -08:00
Ricardo M. Correia ba0a56bb2a Fix struct ht_lock padding in arc.c.
This was leading to a compilation error because in Linux, sizeof
(kmutex_t) can be larger than 64 in some circumstances (e.g. with
debugging and lockdep enabled).

The code was previously fixed to align the structure to 256 bytes,
but a better fix is to align it to the next multiple of 64 bytes.
2010-03-09 13:49:36 -08:00
Brian Behlendorf 4198550b18 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-09 13:25:42 -08:00
Brian Behlendorf e5fd6fb97f Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-09 13:25:16 -08:00
Brian Behlendorf f134f893c1 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-09 13:25:09 -08:00
Brian Behlendorf c0485b7731 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-09 13:25:02 -08:00
Brian Behlendorf 759c1e4f99 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-09 13:25:02 -08:00
Brian Behlendorf 89f4f4a695 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-09 13:24:37 -08:00
Brian Behlendorf 6c0502f5a6 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-09 13:24:32 -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 3ea63f0cdb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-09 12:31:25 -08:00
Brian Behlendorf eda82c813d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-09 12:30:57 -08:00
Brian Behlendorf 3ea409cfce Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-09 12:30:50 -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 324bb92af5 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-09 12:30:19 -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 49f514aabb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-09 10:31:33 -08:00
Brian Behlendorf 4d0e16b4a8 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-09 10:31:05 -08:00
Brian Behlendorf 4aec8c8fe5 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-09 10:30:58 -08:00
Brian Behlendorf 0d3d0d9497 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-09 10:30:51 -08:00
Brian Behlendorf bbb9ce3401 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-09 10:30:50 -08:00
Brian Behlendorf f3aec3d1eb Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-09 10:30:26 -08:00
Brian Behlendorf e760d8d950 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-09 10:30:21 -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 16cc96a13f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-08 13:48:38 -08:00
Brian Behlendorf aed42f2444 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-08 13:48:23 -08:00
Brian Behlendorf b87bc94fb0 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-08 13:48:19 -08:00
Brian Behlendorf 7be37fe5f3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-08 13:48:16 -08:00
Brian Behlendorf 9974a98a5d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-08 13:48:15 -08:00
Brian Behlendorf 5f51cdd50a Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-08 13:48:02 -08:00
Brian Behlendorf 6dffc18479 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-08 13:47:59 -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 ed3451bd03 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:47 -08:00
Brian Behlendorf 5f863d5936 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-03-08 10:51:39 -08:00
Brian Behlendorf df688225a3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-08 10:51:37 -08:00
Brian Behlendorf 4dbd1e59e5 Configure checks for kernel build options incompatible with the license
Changes for linux-kernel-disk topic branch, see commit fd75782.
2010-03-08 10:47:55 -08:00
Brian Behlendorf 7121867aea Configure checks for kernel build options incompatible with the license
Changes for linux-kernel-module topic branch, see commit fd75782.
2010-03-08 10:45:19 -08:00
Brian Behlendorf efc3e7a375 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-01-08 11:40:18 -08:00
Brian Behlendorf 6037f5f124 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-01-08 11:40:01 -08:00
Brian Behlendorf e4a4e686cd Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-01-08 11:39:56 -08:00
Brian Behlendorf 237341f2ce Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-01-08 11:39:52 -08:00
Brian Behlendorf 39d8b611e3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-01-08 11:39:52 -08:00
Brian Behlendorf 63a3d1f7b9 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-01-08 11:39:35 -08:00
Brian Behlendorf 889f0e5e30 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-01-08 11:39:32 -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 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 259647c1f1 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-01-08 11:39:23 -08:00
Brian Behlendorf 365c47de76 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2010-01-08 11:39:18 -08:00
Brian Behlendorf 68fc990a4b Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2010-01-08 11:39:16 -08:00
Brian Behlendorf 8513efcadd Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2010-01-08 11:39:16 -08:00
Brian Behlendorf c1d363770f Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-01-08 11:39:16 -08:00
Brian Behlendorf 6cb71e1dec Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-01-08 11:39:14 -08:00
Brian Behlendorf ad95bcb285 Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2010-01-08 11:39:12 -08:00
Brian Behlendorf e6f83f6a79 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-01-08 11:39:11 -08:00
Brian Behlendorf cdbe3032eb Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2010-01-08 11:39:09 -08:00
Brian Behlendorf adb3a3deec Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2010-01-08 11:39:08 -08:00
Brian Behlendorf 519a66c6ef Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2010-01-08 11:39:07 -08:00
Brian Behlendorf d48b3a8869 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2010-01-08 11:39:06 -08:00
Brian Behlendorf 19982171a8 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2010-01-08 11:39:05 -08:00
Brian Behlendorf aeb5db5cbc Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2010-01-08 11:39:04 -08:00
Brian Behlendorf 8d4f979e7f Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2010-01-08 11:39:01 -08:00
Brian Behlendorf 69804965e9 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-01-08 11:39:00 -08:00
Brian Behlendorf e69572c1b5 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-01-08 11:39:00 -08:00
Brian Behlendorf 4cd8e49a69 Add .gitignore files to exclude build products 2010-01-08 11:35:17 -08:00
Brian Behlendorf 821cec7046 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-12-23 14:50:47 -08:00
Brian Behlendorf 9345a0c1a0 Using autoconf check define fmode_t typedef if undefined. 2009-12-23 14:45:04 -08:00
Brian Behlendorf cbafee6ff0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-12-18 14:32:29 -08:00
Brian Behlendorf 25ecf0dd97 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-12-18 14:32:05 -08:00
Brian Behlendorf 05952b960d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-12-18 14:31:58 -08:00
Brian Behlendorf 08571cee27 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-12-18 14:31:51 -08:00
Brian Behlendorf 5b0a1c06d5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-12-18 14:31:51 -08:00
Brian Behlendorf fcdc7ae52d Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-12-18 14:31:30 -08:00
Brian Behlendorf 8ffe347acc Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-12-18 14:31:23 -08:00
Brian Behlendorf 93b5403a64 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-12-18 14:31:22 -08:00
Brian Behlendorf 1a36b0ada1 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-12-18 14:31:22 -08:00
Brian Behlendorf b58747a2e2 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2009-12-18 14:31:21 -08:00
Brian Behlendorf 70ddc1393f No inline to keep dmu_recv_stream() stack frame less than 1024 bytes.
Recent builds against 2.6.31 flagged dmu_recv_stream() as stack heavy.
As a quick simple way to resolve this I'm preventing the inlining of
certain functions which gcc will inline here because this is the only
place they are called.  Futher analysis of this function should be
performed to futher reduce its stack usage.
2009-12-18 14:22:02 -08:00
Brian Behlendorf 86debac4c4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-12-11 12:08:43 -08:00
Brian Behlendorf 7b8fbda25b Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-12-11 12:08:13 -08:00
Brian Behlendorf f73c310efd Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-12-11 12:08:08 -08:00
Brian Behlendorf 4e7da53a39 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-12-11 12:08:06 -08:00
Brian Behlendorf 57e0171065 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-12-11 12:07:58 -08:00
Brian Behlendorf 8bc41ddf2e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-12-11 12:07:58 -08:00
Brian Behlendorf 2b8880572a Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-12-11 12:07:31 -08:00
Brian Behlendorf 52fbfecea5 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-12-11 12:07:26 -08:00
Brian Behlendorf acd798cfd4 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-12-11 12:07:23 -08:00
Brian Behlendorf f8d093f69b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-12-11 12:07:23 -08:00
Brian Behlendorf b76d12a644 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-12-11 12:07:22 -08:00
Brian Behlendorf f76a6daca5 Use check_disk_change() instead of revalidate_disk().
For 2.6.27 kernels are earlier revalidate_disk() was not available.
However, check_disk_change() has been available for far longer and
will properly inform the kernel of the volume change for both older
and newer kernels.
2009-12-11 12:02:45 -08:00
Brian Behlendorf 0dad9b2f9a Adding missed * in debug ASSERT. 2009-12-11 12:02:05 -08:00
Brian Behlendorf 8f1eb1049b Use MAXOFFSET_T instead of SPEC_MAXOFFSET_T for 32-bit arch. 2009-12-11 12:01:16 -08:00
Brian Behlendorf ba7ccf8ccd Cast to unsigned long long for 32-bit arches 2009-12-11 11:41:04 -08:00
Brian Behlendorf 45a5551a0e Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
Conflicts:

	module/zfs/zfs_ioctl.c
2009-11-20 12:11:23 -08:00
Brian Behlendorf fb1b00e9f4 Linux ZVOL implementation; kernel-side changes
At last a useful user space interface for the Linux ZFS port arrives.
With the addition of the ZVOL real ZFS based block devices are available
and can be compared head to head with Linux's MD and LVM block drivers.
The Linux ZVOL has not yet had any performance work done but from a user
perspective it should be functionally complete and behave like any other
Linux block device.

The ZVOL has so far been tested using zconfig.sh on the following x86_64
based platforms: FC11, CHAOS4, RHEL5, RHEL6, and SLES11.  However, more
testing is required to ensure everything is working as designed.

What follows in a somewhat detailed list of changes includes in this
commit to make ZVOL's possible.  A few other issues were addressed in
the context of these changes which will also be mentioned.

* Added module/zfs/zvol.c which is based off the original Solaris ZVOL
implementation but rewritten to intergrate with the Linux block device
APIs.  The basic design remains the similar in Linux with the major
change being request processing.  Request processing is handled by
registering a request function which the elevator calls once all request
merges is finished and the elevator unplugs.  This function is called
under a spin lock and the request structure is passed to the block driver
to be queued for IO.  The elevator must be notified asyncronously once
the request completes or fails with an error.  This allows us the block
driver a chance to handle many request concurrently.  For the ZVOL we
maintain a taskq with a service thread per core.  As requests are delivered
by the elevator each request is dispatched to the taskq.  The task queue
handles each request with a write or read helper function which basically
copies the request data in to our out of the DMU object.  Writes single
completion as soon as the DMU has the data unless they are marked sync.
Reads are all handled syncronously however the elevator will merge many
small reads in to a large read before it submitting the request.

* Cachine is worth specifically mentioning.  Because both the Linux VFS
and the ZFS ARC both want to fully manage the cache we unfortunately
end up with two caches.  This means our memory foot print is larger
than otherwise expected, and it means we have an extra copy between
the caches, but it does not impact correctness.  All syncs are barrior
requests I believe are handled correctly.  Longer term there is lots of
room for improvement here but it will require fairly extensive changes
to either the Linux VFS and VM layer, or additional DMU interfaces to
handle managing buffer not directly allocated by the ARC.

* Added module/zfs/include/sys/blkdev.h which contains all the Linux
compatibility foo which is required to handle changes in the Linux block
APIs from 2.6.18 thru 2.6.31 based kernels.

* The dmu_{read,write}_uio interfaces which don't make sense on Linux
have been modified to dmu_{read,write}_req functions which consume the
standard Linux IO request structure.  Their function fundamentally
remains the same so this happily worked out pretty cleanly.

* The /dev/zfs character device is no longer created through the half
implemented Solaris driver DDI interfaces.  It is now simply created
with it's own major number as a Linux misc device which greatly simplifies
everything.  It is only capable of handling ioctls() but this fits nicely
because that's all it ever has to do.  The ZVOL devices unlike in Solaris
do not leverage the same major number as /dev/zfs but instead register
their own major.  Because only one major is allocated and space is reserved
for 16 partitions per-device there is a limit of 16384 concurrent ZVOL
devices.  By using multiple majors like the scsi driver this limit could
be addressed if it becomes a problem.

* The {spa,zfs,zvol}_busy() functions have all be removed because they
are not required on a Linux system.  Under Linux the registered module
exit function will not be called while the are still references to the
module.  Once the exit function is called however it must succeed or
block, it may not fail so returning an error on module unload makes to
sense under Linux.

* With the addition of ZVOL support all the HAVE_ZVOL defines were removed
for obvious reasons.  However, the HAVE_ZPL defines have been relocated
in to the linux-{kernel,user}-disk topic branches and must remain until
the ZPL is implemented.
2009-11-20 11:06:59 -08:00
Brian Behlendorf 6376951ac9 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-11-20 10:58:52 -08:00
Brian Behlendorf 67154a81b9 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-20 10:58:51 -08:00
Brian Behlendorf bc20ccb15c Revert just zfs_ioctl.c changes moved to linux-kernel-disk branch. 2009-11-20 10:55:19 -08:00
Brian Behlendorf a40a4803a8 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-11-20 10:39:42 -08:00
Brian Behlendorf 6936334ac1 Revert linux-have-uio-rw branch, moved to linux-kernel-disk branch. 2009-11-20 10:35:26 -08:00
Brian Behlendorf 0fa82994c4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-11-20 10:31:30 -08:00
Brian Behlendorf fa92669c86 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-11-20 10:30:58 -08:00
Brian Behlendorf 49fdb13bc8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-11-20 10:30:50 -08:00
Brian Behlendorf 29dd6c3161 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-11-20 10:30:42 -08:00
Brian Behlendorf 7da32c3c8e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-11-20 10:30:41 -08:00
Brian Behlendorf 4edabd1904 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-11-20 10:30:30 -08:00
Brian Behlendorf d40808c351 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-20 10:30:28 -08:00
Brian Behlendorf 07cdadc1f8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-20 10:30:27 -08:00
Brian Behlendorf 2fb4c69f17 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-11-20 10:29:58 -08:00
Brian Behlendorf 6d8a17ed45 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-11-20 10:29:52 -08:00
Brian Behlendorf cac1bc41dc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-11-20 10:29:49 -08:00
Brian Behlendorf 77c347db31 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-11-20 10:29:48 -08:00
Brian Behlendorf 0f315a58bb Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-11-20 10:29:47 -08:00
Brian Behlendorf 0160d32326 Symbol spa_busy() not required in Linux port removing EXPORT_SYMBOL 2009-11-20 10:16:37 -08:00
Brian Behlendorf 3191b962f6 Prevent gcc uninit compiler warning in zfs_range_unlock_reader(). 2009-11-20 09:59:58 -08:00
Brian Behlendorf 911692fabb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-11-15 16:28:51 -08:00
Brian Behlendorf 5fac7f55be Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-11-15 16:28:16 -08:00
Brian Behlendorf 50e6c144e6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-11-15 16:28:08 -08:00
Brian Behlendorf 52f859a6cc Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-11-15 16:27:59 -08:00
Brian Behlendorf af5810b03a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-11-15 16:27:59 -08:00
Brian Behlendorf c03a7d863c Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-11-15 16:27:44 -08:00
Brian Behlendorf b6c57fe77e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-15 16:27:44 -08:00
Brian Behlendorf 826e82eff2 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-11-15 16:27:12 -08:00
Brian Behlendorf 1b5b05c1c3 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-11-15 16:27:05 -08:00
Brian Behlendorf d00a0ea8a0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-11-15 16:27:02 -08:00
Brian Behlendorf 71ccaccb2b Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-11-15 16:27:00 -08:00
Brian Behlendorf 475e214ce1 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2009-11-15 16:27:00 -08:00
Brian Behlendorf 65f6d4b712 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-11-15 16:26:58 -08:00
Brian Behlendorf 8c5797df77 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-11-15 16:26:58 -08:00
Brian Behlendorf e530326e8f Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-11-15 16:26:48 -08:00
Brian Behlendorf b57e406dd6 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-11-15 16:26:47 -08:00
Brian Behlendorf 8d0c0b0782 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-11-15 16:26:39 -08:00
Brian Behlendorf dcd4d95764 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-11-15 16:26:37 -08:00
Brian Behlendorf 00f3dfb5e9 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-11-15 16:26:36 -08:00
Brian Behlendorf e57bf40c98 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-11-15 16:26:36 -08:00
Brian Behlendorf 59cbe87375 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-11-15 16:26:31 -08:00
Brian Behlendorf ed1f75364a Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2009-11-15 16:26:26 -08:00
Brian Behlendorf 123728d9ae Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2009-11-15 16:26:23 -08:00
Brian Behlendorf 4f9acff2d8 Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2009-11-15 16:26:20 -08:00
Brian Behlendorf b5e7e8a1de Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2009-11-15 16:26:17 -08:00
Brian Behlendorf 26844cb8e1 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-11-15 16:26:14 -08:00
Brian Behlendorf 217998d1a3 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-11-15 16:26:12 -08:00
Brian Behlendorf ecdec2a90d Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-11-15 16:26:08 -08:00
Brian Behlendorf 56d2a97b3b Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-11-15 16:26:05 -08:00
Brian Behlendorf 109d34244d Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-11-15 16:26:02 -08:00
Brian Behlendorf 9d03c28169 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-11-15 16:25:53 -08:00
Brian Behlendorf d8aef5d7bc Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-11-15 16:25:52 -08:00
Brian Behlendorf 030d49c262 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-11-15 16:25:50 -08:00
Brian Behlendorf 0aa61e8427 Remove zvol.c when updating in update-zfs.sh Linux version available. 2009-11-15 16:20:01 -08:00
Brian Behlendorf e576375b9f Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-11-15 16:11:05 -08:00
Brian Behlendorf e588ef08cb Revert contents of linux-have-zpl topic branch. 2009-11-15 16:06:10 -08:00
Brian Behlendorf d876a087ff Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-11-15 15:58:22 -08:00
Brian Behlendorf b38252d3ec Revert contents of linux-have-zvol topic branch. 2009-11-15 15:52:29 -08:00
Brian Behlendorf a4fb9a97f1 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-11-12 12:55:54 -08:00
Brian Behlendorf e68f100aaa Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-11-12 12:55:49 -08:00
Brian Behlendorf 73fe782522 Use HAVE_BDEV_LOGICAL_BLOCK_SIZE compat marco in vdev_disk.
This is a 2.6.31 API change.
2009-11-12 12:51:16 -08:00
Brian Behlendorf 564d6273e2 Mutexs will exceed 64 bytes for debug builds in 2.6.31 kernels.
Increase the pad size accordingly to handle this.
2009-11-12 12:45:28 -08:00
Brian Behlendorf 6f111fc3e6 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-10-27 15:03:16 -07:00
Brian Behlendorf ed97b4447d Adds the last missing block device support (merge_bdev support)
This change should wrap up the last of the missing block device
support in the vdev_disk layer.  With this change I can now
successfully create and use zpools which are layered on top of
md and lvm virtual devices.  The following changes include:

1) The big one, properly handle the case when page cannot be added
to a bio due to dynamic limitation of a merge_bdev handler.  For
example the md device will limit a bio to the configured stripe
size.  Our bio size may also end up being limited by the maximum
request size, and other factors determined during bio construction.

To handle all of the above cases the code has been updated to
handle failures from bio_add_page().  This had been hardcoded to
never fail for the prototype proof of concept implementation.  In
the case of a failure the number of bytes which still need to be
added to a bio are returned.  New bio's are allocated and attached
to the dio until the entire data buffer is mapped to bios.  It is
then submitted as before to the request queue, and once all the bio's
attached to a dio have finished the completion callback is run.

2) The devid comments have been removed because it is not clear to
me that we will not need devid support.  They have been replaced
with a comment explaining that udev can and should be used.
2009-10-27 14:38:38 -07:00
Brian Behlendorf ef2618aff8 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-10-14 16:32:15 -07:00
Brian Behlendorf 18eee5d03f Fix sector size and capacity calculation.
Remove the hard coded 512 byte SECTOR_SIZE and replace it with
bdev_hardsect_size() to get the correct hardware sector size.

Usage of get_capacity() was incorrect.  We the block_device
references a partition we need to return bdev->part->nr_sects.
If get_capacity() is used the entire device size will be returned
ignoring partition information.  This is however the correct thing
to do when the block device in question has not partition table.
2009-10-14 16:02:51 -07:00
Brian Behlendorf 5b421bb734 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-10-06 12:27:51 -07:00
Brian Behlendorf 6df0b54851 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-10-06 12:27:50 -07:00
Brian Behlendorf bea5b8a0a2 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-10-06 12:27:31 -07:00
Brian Behlendorf cf1bc6baa5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-10-06 12:27:28 -07:00
Brian Behlendorf 5bc2e9e592 Add spa_config_path module option for alternate cache file. 2009-10-06 12:17:38 -07:00
Brian Behlendorf 73ff39b18d Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-10-02 16:35:40 -07:00
Brian Behlendorf b5b5b23cbf Use kobject_set_name() for increased portability.
As of 2.6.25 kobj->k_name was replaced with kobj->name.  Some distros
such as RHEL5 (2.6.18) add a patch to prevent this from being a problem
but other older distros such as SLES10 (2.6.16) have not.  To avoid
the whole issue I'm updating the code to use kobject_set_name() which
does what I want and has existed all the way back to 2.6.11.
2009-10-02 16:31:23 -07:00
Brian Behlendorf 48cc6b6565 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-10-01 17:09:46 -07:00
Brian Behlendorf e6359e0281 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-10-01 17:08:10 -07:00
Brian Behlendorf 3c5e68488a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-10-01 17:08:09 -07:00
Brian Behlendorf cd01e2a6c9 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-10-01 17:08:00 -07:00
Brian Behlendorf ea0bf0146f Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-10-01 17:07:58 -07:00
Brian Behlendorf 69bdec9913 Update to use spl_module_{init,exit}() macro API. 2009-10-01 16:49:12 -07:00
Brian Behlendorf 6e2c55b5a6 Update to use spl_module_{init,exit}() macro API. 2009-10-01 16:47:49 -07:00
Brian Behlendorf 159833d991 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-09-02 15:26:43 -07:00
Brian Behlendorf c39498254d Extra reference required for dio struct in __vdev_disk_physio.
Exposed by the fc11 debug kernel we need to hold a reference over all
calls to submit_bio().  Otherwise it is possible all the completion
callbacks run before we exit __vdev_disk_physio(), and we end up with
a GPF.  This was quickly exposed when slab poisoning was enabled.  I
have added helper functions to cleanly track the reference counts.  In
addition dr->dr_ref was converted from an integer to an atomic type
which removes the need for the spinlock.  As a nice side effect of
these changes the code is now slightly cleaner and clearer.
2009-09-02 15:08:40 -07:00
Brian Behlendorf 07dd64facf Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-08-18 14:22:27 -07:00
Brian Behlendorf 1365576b3e Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-18 14:22:24 -07:00
Brian Behlendorf cd710627dd Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-18 14:21:47 -07:00
Brian Behlendorf 1c5a67a320 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-18 14:20:58 -07:00
Brian Behlendorf f3f51aee8c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-18 14:20:46 -07:00
Brian Behlendorf 1d5a7b235b Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-08-18 14:20:37 -07:00
Brian Behlendorf bc611acf53 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-18 14:20:35 -07:00
Brian Behlendorf d2450a3d32 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-18 14:20:23 -07:00
Brian Behlendorf 431189f377 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-18 14:20:21 -07:00
Brian Behlendorf 623479aa05 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-08-18 14:20:01 -07:00
Brian Behlendorf 5edf1e174e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-18 14:19:58 -07:00
Brian Behlendorf ad97c53c74 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-08-18 14:19:57 -07:00
Brian Behlendorf 90f5488896 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-08-18 14:18:49 -07:00
Brian Behlendorf 147adbe815 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-18 14:18:40 -07:00
Brian Behlendorf e4b55cfbff Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-18 14:18:36 -07:00
Brian Behlendorf 5d83878f46 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 14:18:34 -07:00
Brian Behlendorf ef74bed821 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-08-18 14:18:32 -07:00
Brian Behlendorf f3ddd9d082 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-08-18 14:18:32 -07:00
Brian Behlendorf 8767bb3fdd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-08-18 14:18:31 -07:00
Brian Behlendorf 4de2019bdd Required build 121 updates for linux-have-zvol 2009-08-18 14:11:29 -07:00
Brian Behlendorf 6d772ec7d2 Required build 121 updates for linux-have-zpl 2009-08-18 14:11:06 -07:00
Brian Behlendorf 218ddf3d52 Required build 121 updates for linux-kernel-module 2009-08-18 14:10:33 -07:00
Brian Behlendorf f9a74de46a Required build 121 updates for gcc-uninit 2009-08-18 14:09:35 -07:00
Brian Behlendorf 08f5b3c23d Required build 121 updates for gcc-shadow 2009-08-18 14:09:15 -07:00
Brian Behlendorf d42b88372f Required build 121 updates for gcc-c90 2009-08-18 14:07:25 -07:00
Brian Behlendorf 6e43f5a80b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:

	module/zfs/rrwlock.c
	module/zfs/zfs_ioctl.c
2009-08-18 12:59:17 -07:00
Brian Behlendorf 543989b909 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-18 12:35:28 -07:00
Brian Behlendorf 5f0eb517cf Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-18 12:34:24 -07:00
Brian Behlendorf 1cf9e2582c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-18 12:34:09 -07:00
Brian Behlendorf b3561355b8 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-18 12:33:54 -07:00
Brian Behlendorf 6a97dcc2bf Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-18 12:33:39 -07:00
Brian Behlendorf 7c3b0a4a2f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-18 12:33:35 -07:00
Brian Behlendorf c9519311a3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-18 12:33:10 -07:00
Brian Behlendorf 954484f75d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:

	module/zfs/dsl_dataset.c
	module/zfs/spa_history.c
2009-08-18 12:32:53 -07:00
Brian Behlendorf d5cfd05528 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-08-18 12:29:16 -07:00
Brian Behlendorf c67303e092 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/dsl_dataset.c
	module/zfs/rrwlock.c
	module/zfs/spa_history.c
	module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -07:00
Brian Behlendorf 50c623ccef Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-18 12:10:55 -07:00
Brian Behlendorf 8aab887b7c Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-08-18 12:10:47 -07:00
Brian Behlendorf 5a81224e6f Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2009-08-18 12:10:43 -07:00
Brian Behlendorf bfbac5daec Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-08-18 12:10:38 -07:00
Brian Behlendorf 4f6bbcd0e7 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-08-18 12:10:36 -07:00
Brian Behlendorf e20ba40c91 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-08-18 12:10:02 -07:00
Brian Behlendorf f8cca2b295 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-08-18 12:09:57 -07:00
Brian Behlendorf e7c05295ca Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-08-18 12:09:26 -07:00
Brian Behlendorf b330ab77df Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-08-18 12:09:14 -07:00
Brian Behlendorf d205b25a74 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-08-18 12:09:10 -07:00
Brian Behlendorf 25ddaec292 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-08-18 12:09:07 -07:00
Brian Behlendorf b99b422796 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 12:08:58 -07:00
Brian Behlendorf 41b297a27f Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2009-08-18 12:08:46 -07:00
Brian Behlendorf abd8fdb94f Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:

	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
2009-08-18 12:08:36 -07:00
Brian Behlendorf 9d2ca4a4d4 Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2009-08-18 12:07:40 -07:00
Brian Behlendorf db89339134 Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
Conflicts:

	module/zfs/dmu.c
2009-08-18 12:07:23 -07:00
Brian Behlendorf 3a37442dc7 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-08-18 12:06:53 -07:00
Brian Behlendorf c5b5d32d69 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:

	module/zfs/vdev_raidz.c
2009-08-18 12:06:21 -07:00
Brian Behlendorf 481225606c Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-08-18 12:05:39 -07:00
Brian Behlendorf e95fcbffd9 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-08-18 12:05:33 -07:00
Brian Behlendorf 38cc41b5fe Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-08-18 12:05:26 -07:00
Brian Behlendorf 9e903015fd Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-08-18 12:05:07 -07:00
Brian Behlendorf e5e4fadc34 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/dmu.c
	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
	module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
Brian Behlendorf 0f80e41c89 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/spa_misc.c
	module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
Brian Behlendorf 45d1cae3b8 Rebase master to b121 2009-08-18 11:43:27 -07:00
Brian Behlendorf 0803564cbe Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-04 15:58:39 -07:00
Brian Behlendorf ddc0a2d4fe Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-04 15:57:58 -07:00
Brian Behlendorf 4b1d370e4f Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-04 15:57:03 -07:00
Brian Behlendorf f73936be84 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-04 15:56:50 -07:00
Brian Behlendorf 1bfe0d5177 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-04 15:56:36 -07:00
Brian Behlendorf a089c64daa Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-04 15:56:23 -07:00
Brian Behlendorf f2018fdf21 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-04 15:56:21 -07:00
Brian Behlendorf a7a6539d95 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-04 15:55:57 -07:00
Brian Behlendorf 56204aacac Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-08-04 15:55:55 -07:00
Brian Behlendorf 74f5a110b7 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-08-04 15:54:35 -07:00
Brian Behlendorf 72fc3eca7e Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-04 15:54:25 -07:00
Brian Behlendorf f88cbd6535 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-04 15:54:21 -07:00
Brian Behlendorf 8c28ed9bff Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-08-04 15:54:19 -07:00
Brian Behlendorf adcc63f658 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-08-04 15:54:17 -07:00
Brian Behlendorf 7069d048a0 Revert kthreads based on pthread thread specific data due to failure.
With this patch applied I get the following failure 100% of the time,
I'd prefer to debug it and keep moving forward but I do not have the
time right now so I'm reverting the patch to the version which worked.
Ricardo please fix.

(gdb) bt
0  ztest_dmu_write_parallel (za=0x2aaaac898960) at
../../cmd/ztest/ztest.c:2566
1  0x0000000000405a79 in ztest_thread (arg=<value optimized out>)
    at ../../cmd/ztest/ztest.c:3862
2  0x00002b2e6a7a841d in zk_thread_helper (arg=<value optimized out>)
    at ../../lib/libzpool/kernel.c:131
3  0x000000379be06367 in start_thread (arg=<value optimized out>)
    at pthread_create.c:297
4  0x000000379b2d30ad in clone () from /lib64/libc.so.6
2009-08-04 15:42:24 -07:00