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

2784 Commits

Author SHA1 Message Date
Brian Behlendorf c52a71873a Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 15:38:51 -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 541bbe3109 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 15:38:01 -07:00
Brian Behlendorf ec5ef84e8a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 15:37:35 -07:00
Brian Behlendorf 11aa5acb59 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-14 15:37:26 -07:00
Brian Behlendorf f1d30e721b Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-14 15:37:17 -07:00
Brian Behlendorf e796e2a03e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:10 -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 c943bd62d4 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-14 14:44:43 -07:00
Brian Behlendorf a53a9b9e9d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-14 14:44:42 -07:00
Brian Behlendorf 6b17084f5f Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 14:44:31 -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 e0ee5701db Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 14:43:46 -07:00
Brian Behlendorf e35eb21d6a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 14:43:24 -07:00
Brian Behlendorf 80f7cfa759 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-14 14:43:16 -07:00
Brian Behlendorf 3699b41583 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-14 14:43:07 -07:00
Brian Behlendorf 4152507366 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:02 -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 2d5e0d711a Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/zil.c
 2010-05-28 22:23:23 -07:00
Brian Behlendorf 63532dab9f Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/include/sys/zfs_context.h
 2010-05-28 22:22:13 -07:00
Brian Behlendorf a054b40984 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 
Conflicts:
	cmd/zpool/zpool_main.c
 2010-05-28 22:20:07 -07:00
Brian Behlendorf d07f996713 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/zfs_ioctl.c
 2010-05-28 22:18:29 -07:00
Brian Behlendorf fe4485488c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/include/sys/zfs_ioctl.h
 2010-05-28 22:16:13 -07:00
Brian Behlendorf b41143632b Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 
Conflicts:
	cmd/zpool/zpool_main.c
	cmd/zpool/zpool_vdev.c
	cmd/ztest/ztest.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
	lib/libzpool/include/sys/zfs_context.h
	module/zcommon/include/sys/fs/zfs.h
	module/zcommon/zfs_comutil.c
	module/zfs/arc.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dmu_send.c
	module/zfs/dmu_tx.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_dir.c
	module/zfs/dsl_scrub.c
	module/zfs/fm.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/fm/fs/zfs.h
	module/zfs/include/sys/fm/protocol.h
	module/zfs/include/sys/spa.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/include/sys/zvol.h
	module/zfs/spa.c
	module/zfs/spa_boot.c
	module/zfs/spa_history.c
	module/zfs/spa_misc.c
	module/zfs/txg.c
	module/zfs/vdev.c
	module/zfs/zfs_fm.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_replay.c
	module/zfs/zfs_znode.c
	module/zfs/zil.c
	module/zfs/zio.c
 2010-05-28 22:14:39 -07:00
Brian Behlendorf 804b4e0210 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 21:42:29 -07:00
Brian Behlendorf 5e8f78191e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 
Conflicts:
	module/zfs/dmu_send.c
	module/zfs/spa_history.c
	module/zfs/txg.c
	module/zfs/zfs_ioctl.c
 2010-05-28 21:31:31 -07:00
Brian Behlendorf a6c16054e5 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 
Conflicts:
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/dmu.c
	module/zfs/dsl_dataset.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/spa.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/include/sys/zvol.h
	module/zfs/zfs_replay.c
	module/zfs/zfs_znode.c
 2010-05-28 21:26:02 -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 010e4e2f97 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-28 16:43:15 -07:00
Brian Behlendorf 7008960b9e Merge commit 'refs/top-bases/linux-events' into linux-events 
Conflicts:
	lib/libzpool/include/sys/zfs_context.h
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/dsl_scrub.c
	module/zfs/fm.c
	module/zfs/include/sys/fm/fs/zfs.h
	module/zfs/include/sys/fm/protocol.h
	module/zfs/include/sys/spa.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/spa.c
	module/zfs/spa_misc.c
	module/zfs/vdev.c
	module/zfs/zfs_fm.c
 2010-05-28 16:42:29 -07:00
Brian Behlendorf 82b9a38cdb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 16:01:54 -07:00
Brian Behlendorf 97c49607ec Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 
Conflicts:
	module/zcommon/zfs_comutil.c
	module/zfs/arc.c
	module/zfs/dmu_objset.c
	module/zfs/dmu_tx.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_dir.c
	module/zfs/spa.c
	module/zfs/spa_boot.c
	module/zfs/spa_misc.c
	module/zfs/vdev.c
	module/zfs/zil.c
	module/zfs/zio.c
 2010-05-28 16:01:35 -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 ea356d9855 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 12:43:02 -07:00
Brian Behlendorf 6324adf280 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-28 12:43:01 -07:00
Brian Behlendorf 885089decd Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-28 12:42:57 -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 525b1f371b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 12:42:44 -07:00
Brian Behlendorf 0e19c10052 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-28 12:42:37 -07:00
Brian Behlendorf 9f27168dfc Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 12:42:35 -07:00
Brian Behlendorf 649d4cdc0f Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-28 12:42:33 -07:00
Brian Behlendorf 002809a885 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:31 -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 2d2503b90d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 10:17:00 -07:00
Brian Behlendorf 5b621f7d08 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-28 10:16:59 -07:00
Brian Behlendorf d5fbdc7aad Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-28 10:16:41 -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 876b0e797f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 10:15:43 -07:00
Brian Behlendorf d272a44f96 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-28 10:15:14 -07:00
Brian Behlendorf d19bda5de8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 10:15:04 -07:00
Brian Behlendorf 34ac1eae9e Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-28 10:14:54 -07:00
Brian Behlendorf f1e0deaa81 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-28 10:14:45 -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 165448b8b9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 10:03:03 -07:00
Brian Behlendorf 5ba0f3c2f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-28 10:03:02 -07:00
Brian Behlendorf 54f70fc689 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-28 10:02:44 -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 62aa268004 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 10:01:45 -07:00
Brian Behlendorf bf8485c9d2 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-28 10:01:15 -07:00
Brian Behlendorf f6f8a76860 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 10:01:05 -07:00
Brian Behlendorf 143ec76ce9 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-28 10:00:55 -07:00
Brian Behlendorf 410adb5765 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-28 10:00:46 -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 0178413564 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-27 17:04:35 -07:00
Brian Behlendorf b8d1101327 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-27 17:04:34 -07:00
Brian Behlendorf db0b37a11d Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-27 17:04:16 -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 6b667c9a1c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-27 17:03:17 -07:00
Brian Behlendorf 74f42d24c7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-27 17:02:46 -07:00
Brian Behlendorf fb7a18aa41 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 17:02:36 -07:00
Brian Behlendorf 687ffba830 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-27 17:02:26 -07:00
Brian Behlendorf 35c6907c74 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-27 17:02:17 -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 eb3036541f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-27 14:15:42 -07:00
Brian Behlendorf ae4b1b469c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-27 14:15:42 -07:00
Brian Behlendorf f2d0cefacc Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-27 14:15:38 -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 3ce33d954e Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-27 14:15:23 -07:00
Brian Behlendorf ac923554d2 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-27 14:15:15 -07:00
Brian Behlendorf db5e306c22 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 14:15:13 -07:00
Brian Behlendorf 01b8f42635 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-27 14:15:10 -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 aabc970314 Merge branch 'linux-have-mntent' into refs/top-bases/linux-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 8605817009 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-27 13:53:12 -07:00
Brian Behlendorf 84633aa1a1 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-27 13:53:12 -07:00
Brian Behlendorf 0ee82dae98 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 
Conflicts:
	module/zfs/dmu_tx.c
 2010-05-27 13:53:07 -07:00
Brian Behlendorf fd3ff8f53e Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-27 13:52:09 -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 1bc4e2719d Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-27 13:51:54 -07:00
Brian Behlendorf 34dcb41825 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 
Conflicts:
	module/zfs/txg.c
 2010-05-27 13:51:38 -07:00
Brian Behlendorf c8e1e0f44b Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 13:51:06 -07:00
Brian Behlendorf 7685b5a954 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-27 13:51:03 -07:00
Brian Behlendorf 5cad1e175d Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/dmu_tx.c
	module/zfs/txg.c
 2010-05-27 13:48:54 -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 af12c8fa08 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-21 15:31:38 -07:00
Brian Behlendorf 94655e1c30 Use __blk_end_request() in zvol_request() to avoid ZVOL deadlock. 
The unlocked version of blk_end_request() should be used in the
zvol_request() error handling to avoid deadlocking the request_queue
queue_lock.  Things get a little more complicated for older kernel
APIs but the compat layer has been updated as well to reflect this.
 2010-05-21 15:01:12 -07:00
Brian Behlendorf a221019e82 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-20 17:17:42 -07:00
Brian Behlendorf cdd590f8b9 Recreate volume and snapshot /dev links during module load. 
Links in /dev for volumes/snapshots were only being created
at volume/snapshot creation time.  Those links are now also
created dynamically at module load time based on the spa config.
In other words all you need to do to get access to your zfs
datasets after a reboot is load the module.  It's magic!
 2010-05-20 16:59:02 -07:00
Brian Behlendorf c8d574777d Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-20 14:51:13 -07:00
Brian Behlendorf fe3cca82ae Support KM_NODEBUG kmem flag. 
It turns out the zil allocates quite large buffers.  This isn't
all the surprising but we need to suppress the warnings until
it's clear what to do about it.
 2010-05-20 14:35:02 -07:00
Brian Behlendorf c7068a5d76 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-20 10:25:20 -07:00
Brian Behlendorf 4ae64a8acd Move from kmem_alloc() to vmem_alloc(). 
These two allocations are 16k in size which trips the SPL warning
about large kmem_allocs().  For now simply shift them to a vmem_alloc().
Yes, this has it's own set of problems but this happens infrequently
enough not to be a real issue.  But more importantly it means that
we've flagged this place in the code via this topic branch as a
place which still needs long term work.
 2010-05-20 10:06:32 -07:00
Brian Behlendorf 630ce17804 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-18 14:23:08 -07:00
Brian Behlendorf 86f961b310 Update all zpios related headers for consistency and correctness. 2010-05-18 14:18:09 -07:00
Brian Behlendorf 91975bc4f9 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-18 11:40:29 -07:00
Brian Behlendorf a2c57ce830 Update headers to be correct for public release 
This includes adding the copyright where appropriate, author
attribution, and including the Lawrence Livermore National
Security, LLC release code for new/rewritten files.
 2010-05-18 11:31:37 -07:00
Brian Behlendorf a1658d8d17 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-14 13:31:32 -07:00
Brian Behlendorf bb5e111dde Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-14 13:31:29 -07:00
Brian Behlendorf 08eb7517c4 Remove 3 symbols which no longer need to be exported. 
EXPORT_SYMBOL(zfs_ereport_post);
EXPORT_SYMBOL(zfs_post_remove);
EXPORT_SYMBOL(zfs_post_autoreplace);
 2010-05-14 13:00:22 -07:00
Brian Behlendorf feb723fa7d Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-14 12:55:10 -07:00
Brian Behlendorf 97d19a5e45 Add linux-events topic branch for zevent handling. 
This topic branch leverages the Solaris style FMA call points
in ZFS to create a user space visible event notification system
under Linux.  This new system is called zevent and it unifies
all previous Solaris style ereports and sysevent notifications.

Under this Linux specific scheme when a sysevent or ereport event
occurs an nvlist describing the event is created which looks almost
exactly like a Solaris ereport.  These events are queued up in the
kernel when they occur and conditionally logged to the console.
It is then up to a user space application to consume the events
and do whatever it likes with them.

To make this possible the existing /dev/zfs ABI has been extended
with two new ioctls which behave as follows.

* ZFS_IOC_EVENTS_NEXT
Get the next pending event.  The kernel will keep track of the last
event consumed by the file descriptor and provide the next one if
available.  If no new events are available the ioctl() will block
waiting for the next event.  This ioctl may also be called in a
non-blocking mode by setting zc.zc_guid = ZEVENT_NONBLOCK.  In the
non-blocking case if no events are available ENOENT will be returned.
It is possible that ESHUTDOWN will be returned if the ioctl() is
called while module unloading is in progress.  And finally ENOMEM
may occur if the provided nvlist buffer is not large enough to
contain the entire event.

* ZFS_IOC_EVENTS_CLEAR
Clear are events queued by the kernel.  The kernel will keep a fairly
large number of recent events queued, use this ioctl to clear the
in kernel list.  This will effect all user space processes consuming
events.

The zpool command has been extended to use this events ABI with the
'events' subcommand.  You may run 'zpool events -v' to output a
verbose log of all recent events.  This is very similar to the
Solaris 'fmdump -ev' command with the key difference being it also
includes what would be considered sysevents under Solaris.  You
may also run in follow mode with the '-f' option.  To clear the
in kernel event queue use the '-c' option.

$ sudo cmd/zpool/zpool events -fv
TIME                        CLASS
May 13 2010 16:31:15.777711000 ereport.fs.zfs.config.sync
        class = "ereport.fs.zfs.config.sync"
        ena = 0x40982b7897700001
        detector = (embedded nvlist)
                version = 0x0
                scheme = "zfs"
                pool = 0xed976600de75dfa6
        (end detector)

        time = 0x4bec8bc3 0x2e5aed98
        pool = "zpios"
        pool_guid = 0xed976600de75dfa6
        pool_context = 0x0

While the 'zpool events' command is handy for interactive debugging
it is not expected to be the primary consumer of zevents.  This ABI
was primarily added to facilitate the addition of a user space
monitoring daemon.  This daemon would consume all events posted by
the kernel and based on the type of event perform an action.  For
most events simply forwarding them on to syslog is likely enough.
But this interface also cleanly allows for more sophisticated
actions to be taken such as generating an email for a failed drive
 2010-05-14 12:40:44 -07:00
Brian Behlendorf 93b00c558f Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/zfs_ioctl.c
 2010-05-14 11:51:27 -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 3ae75228e3 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/zfs_ioctl.c
 2010-05-14 11:38:09 -07:00
Brian Behlendorf d18f100fb7 Revert zfs_ioctl.c related changes. 
All the changes required to cleanly integrate with linux style
devices are being moved to their own topic branch.  It was abouti
to get to the point where too many topic branches each wanted to
tweak this code and it was getting confusing.  To simplify this
all /dev/zfs device related changes are being moved to the
linux-kernel-device topic branch.
 2010-05-14 11:24:36 -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 ab2e9b8b7f Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2010-04-29 13:08:10 -07:00
Brian Behlendorf 44ce1eb434 Remove changes from linux-have-fm to prepare for topic branch removal. 2010-04-29 13:04:35 -07:00
Brian Behlendorf d92dfd67f1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 12:33:29 -07:00
Brian Behlendorf d4fcfa8cd6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-04-29 12:32:57 -07:00
Brian Behlendorf 7d37312f6c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 12:32:49 -07:00
Brian Behlendorf 0bf57f091f Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-04-29 12:32:43 -07:00
Brian Behlendorf 0eff4db8b4 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-04-29 12:32:41 -07:00
Brian Behlendorf 756a371a3f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-04-29 12:32:40 -07:00
Brian Behlendorf da44260bb8 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-04-29 12:32:27 -07:00
Brian Behlendorf 2e161f3b31 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-04-29 12:32:10 -07:00
Brian Behlendorf a3b3d2b059 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 12:32:04 -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 f1a28f535c Export required nv_alloc_fixed symbols. 2010-04-29 12:21:24 -07:00
Brian Behlendorf 9dc83e5f34 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 12:06:04 -07:00
Brian Behlendorf f4295781e2 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-04-29 12:05:32 -07:00
Brian Behlendorf be442baea7 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 12:05:23 -07:00
Brian Behlendorf 47026cc874 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-04-29 12:05:15 -07:00
Brian Behlendorf 886cee417f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-04-29 12:05:14 -07:00
Brian Behlendorf 89a01d411b Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-04-29 12:05:02 -07:00
Brian Behlendorf 9fa021c2c1 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-04-29 12:04:45 -07:00
Brian Behlendorf fa60ee8c86 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 12:04:39 -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 aebb002361 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 11:02:09 -07:00
Brian Behlendorf bf68847fd6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-04-29 11:01:39 -07:00
Brian Behlendorf e46d019df6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-04-29 11:01:31 -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 f886f90462 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-04-29 11:01:11 -07:00
Brian Behlendorf b98d7711a6 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-04-29 11:00:54 -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 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 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 4fa80d8d60 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-04-29 10:42:26 -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 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
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 36fd3fc49c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-03-09 13:24:52 -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 ca6b87c127 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-03-09 12:30:32 -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 ca6801fcb2 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-03-09 10:30:39 -08:00