Commit Graph

2402 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 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 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 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 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 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