Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
3,775 Commits 42 Branches 132 Tags 226 MiB
Commit Graph

799 Commits

Author SHA1 Message Date
Brian Behlendorf 0c524122bd Add fix-stack-dsl_dir_open_spa topic branch 
Reduce stack usage by 256 bytes by moving buf char array from
the stack to the heap.
 2010-06-16 12:39:44 -07:00
Brian Behlendorf 7354ad589b Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-16 12:17:18 -07:00
Brian Behlendorf 9fd12ce4fd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 12:11:21 -07:00
Brian Behlendorf 2b71569742 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-16 12:11:20 -07:00
Brian Behlendorf 877a37d8bd Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-16 12:11:18 -07:00
Brian Behlendorf 8a001d8f59 Extra uninit vars flagged by gcc 4.1.2 
Newer versions of the compiler are OK with this but for the sake of
older compilers explicitly initialize them.
 2010-06-16 11:45:07 -07:00
Brian Behlendorf bfdcbd7014 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 17:00:21 -07:00
Brian Behlendorf b41c7ff877 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 16:45:47 -07:00
Brian Behlendorf 7f181ac166 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-14 16:45:46 -07:00
Brian Behlendorf 2f30cc0188 Merge branch 'fix-stack-lzjb' into refs/top-bases/fix-branch 2010-06-14 16:45:33 -07:00
Brian Behlendorf b8cc785fb6 Add fix-stack-lzjb topic branch 
Reduce kernel stack usage by lzjb_compress() by moving uint16 array
off the stack and on to the heap.  The exact performance implications
of this I have not measured but we absolutely need to keep stack
usage to a minimum.  If/when this becomes and issue we optimize.
 2010-06-14 16:45:01 -07:00
Brian Behlendorf 51322821f3 Merge branch 'fix-kstat-xuio' into refs/top-bases/fix-branch 2010-06-14 16:43:32 -07:00
Brian Behlendorf f61a7ce9e1 Add fix-kstat-xuio topic branch 
Move xiou stat structures from a header to the dmu.c source as is
done with all the other kstat interfaces.  This information is local
to dmu.c registered the xuio kstat and should stay that way.
 2010-06-14 16:43:01 -07:00
Brian Behlendorf 963518b20f Merge branch 'fix-metaslab' into refs/top-bases/fix-branch 2010-06-14 16:40:45 -07:00
Brian Behlendorf f3a61f709d Add fix-metaslab topic branch 
If your only going to allow one allocator to be used and it is defined
at compile time there is no point including the others in the build.
This patch could/should be refined for Linux to make the metaslab
configurable at run time.  That might be a bit tricky however since
you would need to quiese all IO.  Short of that making it configurable
as a module load option would be a reasonable compromise.
 2010-06-14 16:40:26 -07:00
Brian Behlendorf f3f44cbd31 Merge branch 'fix-current' into refs/top-bases/fix-branch 2010-06-14 16:39:27 -07:00
Brian Behlendorf 6cf7f7c9df Add fix-current topic branch 
In the linux kernel 'current' is defined to mean the current process
and can never be used as a local variable in a function.  Simply
replace all usage of 'current' with 'curr' in this function.
 2010-06-14 16:38:56 -07:00
Brian Behlendorf 4dfa80d6c8 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 16:29:16 -07:00
Brian Behlendorf 08060ef853 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 16:25:02 -07:00
Brian Behlendorf eb894076a4 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 
Conflicts:

	cmd/ztest/ztest.c
 2010-06-14 16:24:45 -07:00
Brian Behlendorf bce1904fbb Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-06-14 16:21:59 -07:00
Brian Behlendorf 49ad53c46f Update fix-taskq to never sleep at interrupt time 
Updated fix to detect if we are in an interrupt and only sleep if it
is safe to do some.  I guess it must be safe to sleep under Solaris
this must be handled in a sort interrupt handler there
 2010-06-14 16:14:23 -07:00
Brian Behlendorf 67e8f48f1b Update linux-kernel-device to handle ioc changes 
Upstream they modified the ioctl code so we need to make similiar
updates since we modify the API ourselves to always pass a pointer
to file pointer around.  This allows us to track per file handle
state which is used by the zevent code.
 2010-06-14 16:04:00 -07:00
Brian Behlendorf 101243ff1d Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 15:53:24 -07:00
Brian Behlendorf 06b5dc883f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 15:51:52 -07:00
Brian Behlendorf 953aa00176 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 15:51:51 -07:00
Brian Behlendorf 5fa2cb516b Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2010-06-14 15:51:50 -07:00
Brian Behlendorf c430e23552 Update zfs-branch with build system updates 
Required Makefile modifications for updated ZFS code.
 2010-06-14 15:46:11 -07:00
Brian Behlendorf 696ec7fb61 Update gcc-missing-braces based on structure changes 
Almost exclusively this patch handled the addition of another char
array to the zfs_cmd_t structure.  Unfortunately c90 doesn't allow
zero filling the entire struct with the '= { 0 };' shorthand.
 2010-06-14 15:44:06 -07:00
Brian Behlendorf ac23e26b6c Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 15:38:42 -07:00
Brian Behlendorf 7eadc495c6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 15:37:05 -07:00
Brian Behlendorf b5ba75f385 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 15:37:03 -07:00
Brian Behlendorf dfe881c0ef Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-06-14 15:37:01 -07:00
Brian Behlendorf 1e7a75049a Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf c8d75a1c9d Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf d9f910d423 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 993fa8c15c Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 2c95012288 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 3135b5a26a Update gcc-c90 minor updates 
Originally these changes were on other gcc-* topic branches but
because c90 touches the same bit of code and I'd like to keep all
the gcc-* branches completely parallel I've moved these few bits
over here.  This is one of the downsides of not just having one
big patch stack.
 2010-06-14 15:32:54 -07:00
Brian Behlendorf d8e123dc27 Update gcc-unused 
Fix new instances or changes in gcc flagged unused code.  These are
mostly related to variables which are not used when debugging is
disabled and the ASSERTs are compiled out.
 2010-06-14 15:29:48 -07:00
Brian Behlendorf b41463f5e8 Update gcc-invalid-prototypes 
Fix new invalid prototypes, typically just a missing void arg.
 2010-06-14 15:25:49 -07:00
Brian Behlendorf b320a7bb4b Update gcc-unit 
Fix new possibly uninitialized variables according to gcc.
 2010-06-14 15:24:20 -07:00
Brian Behlendorf 0a8593375e Update gcc-missing-case 
Fix new locations of an incomplete case statement.
 2010-06-14 15:19:09 -07:00
Brian Behlendorf 1893aa76ec Update gcc-no-parenthesis 
Fix new locations of missing parenthesis according to gcc.
 2010-06-14 15:16:41 -07:00
Brian Behlendorf 48bd88f014 Update gcc-c90 
Additional c90 fixes required due to ZFS update, these include fixing new
places c99 specific things have been done and some cleanup of old usage.
 2010-06-14 15:15:26 -07:00
Brian Behlendorf a54633ce22 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 14:44:23 -07:00
Brian Behlendorf bdf5763c0a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 14:42:58 -07:00
Brian Behlendorf 9f9a451561 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 14:42:57 -07:00
Brian Behlendorf fc490c18b6 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2010-06-14 14:42:56 -07:00
Brian Behlendorf dd8f6da3da Update gcc-cast 
Fix new instances of missing casts or assumed types.
 2010-06-14 14:40:10 -07:00
Brian Behlendorf 6860ec4c1d Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 
Conflicts:
	module/zfs/zfs_ioctl.c
 2010-05-28 16:58:21 -07:00
Brian Behlendorf 812761eac5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 
Conflicts:
	cmd/ztest/ztest.c
 2010-05-28 15:46:10 -07:00
Brian Behlendorf e27754d9e8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 
Conflicts:
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_sendrecv.c
	module/zfs/dmu_objset.c
	module/zfs/dnode.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/txg.h
	module/zfs/spa_history.c
 2010-05-28 15:45:38 -07:00
Brian Behlendorf ffaa677995 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 
Conflicts:
	module/zfs/dbuf.c
	module/zfs/dsl_dataset.c
 2010-05-28 15:38:43 -07:00
Brian Behlendorf 3e2be634a5 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 
Conflicts:
	cmd/zdb/zdb.c
	cmd/zdb/zdb_il.c
	cmd/zfs/zfs_main.c
	cmd/zfs/zfs_util.h
	cmd/zinject/zinject.h
	cmd/zpool/zpool_main.c
	cmd/zpool/zpool_util.c
	cmd/ztest/ztest.c
	lib/libnvpair/include/libnvpair.h
	lib/libnvpair/libnvpair.c
	lib/libzfs/libzfs_changelist.c
	lib/libzfs/libzfs_config.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_import.c
	lib/libzfs/libzfs_mount.c
	lib/libzfs/libzfs_pool.c
	lib/libzfs/libzfs_sendrecv.c
	module/avl/avl.c
	module/avl/include/sys/avl.h
	module/nvpair/include/sys/nvpair.h
	module/nvpair/nvpair.c
	module/zcommon/include/zfs_comutil.h
	module/zcommon/include/zfs_prop.h
	module/zcommon/zfs_comutil.c
	module/zfs/arc.c
	module/zfs/dbuf.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dmu_zfetch.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_pool.c
	module/zfs/dsl_prop.c
	module/zfs/dsl_synctask.c
	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/dmu_zfetch.h
	module/zfs/include/sys/dsl_synctask.h
	module/zfs/include/sys/refcount.h
	module/zfs/include/sys/txg.h
	module/zfs/include/sys/uberblock.h
	module/zfs/include/sys/zap_leaf.h
	module/zfs/include/sys/zfs_debug.h
	module/zfs/include/sys/zfs_znode.h
	module/zfs/include/sys/zio_compress.h
	module/zfs/include/sys/zvol.h
	module/zfs/lzjb.c
	module/zfs/metaslab.c
	module/zfs/refcount.c
	module/zfs/sha256.c
	module/zfs/spa.c
	module/zfs/spa_boot.c
	module/zfs/uberblock.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_replay.c
	module/zfs/zio.c
	module/zfs/zio_compress.c
 2010-05-28 15:34:57 -07:00
Brian Behlendorf d60fc5ca30 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 
Conflicts:
	module/zfs/dbuf.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_prop.c
	module/zfs/metaslab.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
 2010-05-28 15:07:36 -07:00
Brian Behlendorf cd47feb3c8 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 
Conflicts:
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c
	module/zfs/arc.c
 2010-05-28 14:56:00 -07:00
Brian Behlendorf 28e07224db Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 
Conflicts:
	lib/libzfs/libzfs_dataset.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_pool.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c
	module/zfs/zio.c
 2010-05-28 14:54:33 -07:00
Brian Behlendorf abfb2a3e1d Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 
Conflicts:
	lib/libzfs/libzfs_changelist.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c
 2010-05-28 14:49:40 -07:00
Brian Behlendorf 3571832262 Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 
Conflicts:
	cmd/zdb/zdb.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_pool.c
	lib/libzfs/libzfs_sendrecv.c
 2010-05-28 14:46:39 -07:00
Brian Behlendorf 2591cac812 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 
Conflicts:
	cmd/zdb/zdb_il.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_mount.c
 2010-05-28 14:42:40 -07:00
Brian Behlendorf 475bf41d1c Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 
Conflicts:
	cmd/zfs/zfs_main.c
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c
 2010-05-28 14:36:18 -07:00
Brian Behlendorf 957b7b41d4 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 
Conflicts:
	cmd/zdb/zdb.c
	cmd/ztest/ztest.c
	module/zfs/dbuf.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_scrub.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zio.c
 2010-05-28 14:19:22 -07:00
Brian Behlendorf 89089d1e4b Merge commit 'refs/top-bases/fix-stack' into fix-stack 
Conflicts:
	module/zfs/dmu_objset.c
	module/zfs/spa_history.c
 2010-05-28 13:54:08 -07:00
Brian Behlendorf 31630287ca Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 
Conflicts:
	lib/libzfs/libzfs_sendrecv.c
	module/zfs/dmu_objset.c
	module/zfs/dnode.c
	module/zfs/dsl_dataset.c
	module/zfs/spa_history.c
 2010-05-28 13:51:29 -07:00
Brian Behlendorf ab1a68b225 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 
Conflicts:
	module/zfs/dnode_sync.c
 2010-05-28 13:46:45 -07:00
Brian Behlendorf 428870ff73 Update core ZFS code from build 121 to build 141. 2010-05-28 13:45:14 -07:00
Brian Behlendorf 79e7a65233 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-28 12:42:55 -07:00
Brian Behlendorf 06da6ccf97 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf 818eafca5b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf c91169c7c5 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 
Conflicts:
	lib/libzfs/libzfs_util.c
 2010-05-28 12:42:27 -07:00
Brian Behlendorf fb72c6ef81 Revert gcc-shadow using -Wno-shadow I can live with 
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts.  Anyway, this ends up being
more simply gratutous change than I care for.
 2010-05-28 12:34:45 -07:00
Brian Behlendorf 75e146efe5 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-28 10:16:32 -07:00
Brian Behlendorf 3450d1f3b5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 10:14:43 -07:00
Brian Behlendorf af051f1250 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 10:14:43 -07:00
Brian Behlendorf 157df8338c Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2010-05-28 10:14:42 -07:00
Brian Behlendorf 9eec97e163 Revert fix-dsl_pool_t fixed upstream 2010-05-28 10:08:02 -07:00
Brian Behlendorf 19e6776b1d Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-28 10:02:34 -07:00
Brian Behlendorf c2c3358a6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 10:00:44 -07:00
Brian Behlendorf 11510b3513 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 10:00:44 -07:00
Brian Behlendorf 396fb1e235 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-05-28 10:00:43 -07:00
Brian Behlendorf 11a9bfc7f8 Revert fix-taskq changes reevaluate after update. 2010-05-28 09:54:03 -07:00
Brian Behlendorf 26f30a4c14 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-27 17:04:06 -07:00
Brian Behlendorf 2fbe461b55 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 17:02:15 -07:00
Brian Behlendorf a7dcb2247a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-27 17:02:14 -07:00
Brian Behlendorf 146ded4db2 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-05-27 17:02:13 -07:00
Brian Behlendorf db069704ed Revert fix-clock-wrap fixed upstream 
This was more or less fixed upstream.  Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.
 2010-05-27 16:54:23 -07:00
Brian Behlendorf f0c3684660 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-27 14:15:35 -07:00
Brian Behlendorf b265da19f0 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 14:15:08 -07:00
Brian Behlendorf 3a7896c8d2 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 14:15:08 -07:00
Brian Behlendorf b754295dec Revert feature-zap-cursor-to-key feature upstream 
We can drop this feature and we will pick up the lastest version
during the b141 update.
 2010-05-27 14:12:59 -07:00
Brian Behlendorf 1c2ab6981b Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-27 13:52:07 -07:00
Brian Behlendorf d8e5eb56b8 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:42:00 -07:00
Brian Behlendorf 028e42b692 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 13:42:00 -07:00
Brian Behlendorf 1dc4235011 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-27 13:40:14 -07:00
Brian Behlendorf 1e32b3c781 Revert feature-commit-cb feature upstream 
We can drop this feature and we will pick up the lastest version
during the b141 update.
 2010-05-27 13:39:17 -07:00
Brian Behlendorf 3bd93e7103 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-27 13:25:20 -07:00
Brian Behlendorf 099e8e493a Remove feature-pthreads prior to b141 update. 
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
 2010-05-27 13:23:58 -07:00
Brian Behlendorf 0c443b1d13 Create linux-kernel-device topic branch. 
This branch contains the majority of the changes required to cleanly
intergrate with Linux style special devices (/dev/zfs).  Mainly this
means dropping all the Solaris style callbacks and replacing them
with the Linux equivilants.  Additionally, this means slightly
expanding the zfs_ioc_* functions to include a 'struct file *' to
allow the tracking of private data for each open file descriptor.
This is very helpful when you need to maintain a little information
about the open file between ioctls().
 2010-05-14 11:48:06 -07:00
Brian Behlendorf 98660aec20 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 12:32:01 -07:00
Brian Behlendorf aa4a91aef5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 12:32:00 -07:00
Brian Behlendorf 354bebb795 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-04-29 12:31:59 -07:00
Brian Behlendorf 89154c98f9 Update build system to include nvpair_alloc_fixed.c. 2010-04-29 12:24:25 -07:00
Brian Behlendorf f26fce7b17 Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c 2010-04-29 12:23:12 -07:00
Brian Behlendorf 66ba722b0a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 12:04:36 -07:00
Brian Behlendorf f3017eccb7 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-04-29 12:04:33 -07:00
Brian Behlendorf 7a062682fb Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2010-04-29 12:04:32 -07:00
Brian Behlendorf 9c10b70375 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-04-29 12:04:31 -07:00
Brian Behlendorf 9d8e4f07ff Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2010-04-29 12:04:30 -07:00
Brian Behlendorf cf4e5324e9 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2010-04-29 12:04:18 -07:00
Brian Behlendorf 695903c308 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2010-04-29 12:04:17 -07:00
Brian Behlendorf 05b4f88b78 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2010-04-29 12:04:07 -07:00
Brian Behlendorf e5edc5104d Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2010-04-29 12:04:04 -07:00
Brian Behlendorf 8273e838de Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-04-29 12:04:03 -07:00
Brian Behlendorf 78559a049a Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2010-04-29 12:04:02 -07:00
Brian Behlendorf e7edc55fff Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 12:03:58 -07:00
Brian Behlendorf 03bc0d94a2 Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2010-04-29 12:03:53 -07:00
Brian Behlendorf ff1883382e Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2010-04-29 12:03:50 -07:00
Brian Behlendorf 6edb312559 Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2010-04-29 12:03:45 -07:00
Brian Behlendorf 3b12e5a66a Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2010-04-29 12:03:42 -07:00
Brian Behlendorf 0ef388e9bb Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2010-04-29 12:03:39 -07:00
Brian Behlendorf 75d373f38d Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2010-04-29 12:03:36 -07:00
Brian Behlendorf f90ac4206e Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2010-04-29 12:03:32 -07:00
Brian Behlendorf e366632a94 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2010-04-29 12:03:29 -07:00
Brian Behlendorf b3b5351af0 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2010-04-29 12:03:20 -07:00
Brian Behlendorf 8279f80885 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-04-29 12:03:18 -07:00
Brian Behlendorf c708851b13 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-04-29 12:03:17 -07:00
Brian Behlendorf 3affbe6d7e Update nvpair's to include nv_alloc_fixed support 2010-04-29 11:59:41 -07:00
Brian Behlendorf c9ae4b9808 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 11:00:46 -07:00
Brian Behlendorf 8535236dca Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-04-29 11:00:45 -07:00
Brian Behlendorf 72de3a8ee1 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2010-04-29 11:00:44 -07:00
Brian Behlendorf 151f424dd8 Strip ident pragma from module/zfs/include/sys/fm/util.h 2010-04-29 10:57:17 -07:00
Brian Behlendorf 4d5d0f9ef5 Include FMA source and headers in build system 2010-04-29 10:55:27 -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 3e6811f827 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2010-04-29 10:41:38 -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