Commit Graph

778 Commits

Author SHA1 Message Date
Brian Behlendorf 2f4e745a09 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 15:08:04 -07:00
Brian Behlendorf bed14af385 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-07-09 15:08:03 -07:00
Brian Behlendorf ae132945b4 Add suggested paranthesis. 2009-07-09 14:59:10 -07:00
Brian Behlendorf f99ad7f4c3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-09 13:19:41 -07:00
Brian Behlendorf ebb013f2dd Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-09 13:19:39 -07:00
Brian Behlendorf db193d4ca9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 13:19:15 -07:00
Brian Behlendorf 17d368fa5f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 13:17:27 -07:00
Brian Behlendorf a3bc97c2c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 13:17:26 -07:00
Brian Behlendorf 9ad0fef49e Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Conflicts:

	module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
Brian Behlendorf 683b2f0d00 TopGit missed this update when I updated the same line in the
gcc-unused and gcc-uninit topic branches at the same time and
then ran 'tg update'.  I'll need to keep that sort of thing
in mind when updating multiple topic branches between updates.
2009-07-09 13:07:05 -07:00
Brian Behlendorf 7f3ee7a5ef Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-09 12:26:00 -07:00
Brian Behlendorf e945770943 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-09 12:25:58 -07:00
Brian Behlendorf 0c3f631b72 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 12:25:32 -07:00
Brian Behlendorf c4c4afd8fd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 12:23:41 -07:00
Brian Behlendorf 6db8882b78 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 12:23:39 -07:00
Brian Behlendorf 76bf02aebb Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-09 12:23:36 -07:00
Brian Behlendorf a551134b2f Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:14:56 -07:00
Brian Behlendorf a19906fe65 Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:13:56 -07:00
Brian Behlendorf f1d99c0653 Revert to original debugging code and wrap any variabled used only
within an ASSERT with the ASSERTV macro which will ensure it will
be removed when the ASSERTs are commented out.  This makes gcc much
happier, makes the variables usage explicit, and removes the need
for the compiler to detect it is unused and do the right thing.
2009-07-09 12:10:52 -07:00
Brian Behlendorf 2018d0e610 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-09 10:41:54 -07:00
Brian Behlendorf 7a724b1db0 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-09 10:41:53 -07:00
Brian Behlendorf 64e827d295 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 10:41:30 -07:00
Brian Behlendorf e5e94c40f7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 10:39:44 -07:00
Brian Behlendorf aa8ed32ee8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 10:39:43 -07:00
Brian Behlendorf 9e394e10a9 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-09 10:39:41 -07:00
Brian Behlendorf 43af29de5f Type int accidentally not declared at the top of the function. 2009-07-09 10:19:02 -07:00
Brian Behlendorf 0d73002d8d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-08 09:18:20 -07:00
Brian Behlendorf 1e0e588128 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-08 09:18:18 -07:00
Brian Behlendorf 1355255010 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 09:17:52 -07:00
Brian Behlendorf 33077ad631 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 09:16:05 -07:00
Brian Behlendorf f00e6fe5c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-08 09:16:04 -07:00
Brian Behlendorf 5fc46112cb Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-08 09:16:01 -07:00
Brian Behlendorf 58f5e63293 Resolve a 2 new cases of for loop variable declared in for() 2009-07-08 09:05:37 -07:00
Brian Behlendorf 6bc6e35298 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-07 16:32:58 -07:00
Brian Behlendorf 8028fd5db5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-07 16:32:57 -07:00
Brian Behlendorf deacdbc785 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-07 16:32:34 -07:00
Brian Behlendorf 0a00d10c24 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 16:30:57 -07:00
Brian Behlendorf 02362668ac Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-07 16:30:56 -07:00
Brian Behlendorf 24daf7747f Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-07 16:30:54 -07:00
Brian Behlendorf 0e310d30de Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-07-07 16:30:54 -07:00
Brian Behlendorf 10dcf485d3 First fit allocator unused comment it out. 2009-07-07 16:23:09 -07:00
Brian Behlendorf ebda366c1c Add missing case introduced by rebase. 2009-07-07 16:22:33 -07:00
Brian Behlendorf 3977001d03 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-07 16:11:12 -07:00
Brian Behlendorf 80528a7792 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-07 16:11:11 -07:00
Brian Behlendorf 77e4a2039c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-07 16:10:51 -07:00
Brian Behlendorf c460e5edb0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 16:09:15 -07:00
Brian Behlendorf 04a83f2337 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-07 16:09:13 -07:00
Brian Behlendorf 55b864f19b Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-07-07 16:09:12 -07:00
Brian Behlendorf f80f59f955 Add missing paranthesis for gcc. 2009-07-07 16:01:13 -07:00
Brian Behlendorf 8e84e9205f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-07 15:52:22 -07:00
Brian Behlendorf 1cf1fc91a1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-07 15:52:21 -07:00
Brian Behlendorf 91316b77b9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-07 15:51:57 -07:00
Brian Behlendorf e5c8fcd6b0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 15:50:14 -07:00
Brian Behlendorf c75167c985 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-07 15:50:13 -07:00
Brian Behlendorf 07a6b68575 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-07-07 15:50:11 -07:00
Brian Behlendorf 7373ddf55f hash_lock should always be initialized 2009-07-07 15:41:19 -07:00
Brian Behlendorf 169b3085db Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
Conflicts:

	module/zfs/dmu.c
2009-07-06 17:01:30 -07:00
Brian Behlendorf 1175906fbc Update zerocopy patch to be consistent with new flags arg
passed to dmu_read().  It would be nice to have one of these
for dmu_write() as well but we have do without for now.
2009-07-06 16:01:41 -07:00
Brian Behlendorf ae68a8980c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
Conflicts:

	module/zfs/include/sys/dmu.h
2009-07-06 15:02:33 -07:00
Brian Behlendorf 1cf1a077cd Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
Conflicts:

	module/zfs/dmu.c
	module/zfs/include/sys/dmu.h
2009-07-06 15:00:24 -07:00
Brian Behlendorf 266a7d8cd7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:

	module/zcommon/zfs_namecheck.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
2009-07-06 13:47:04 -07:00
Brian Behlendorf 658459249e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-06 13:17:28 -07:00
Brian Behlendorf 8795d8f034 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2009-07-06 13:15:43 -07:00
Brian Behlendorf 95ba24ed69 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Conflicts:

	cmd/ztest/ztest.c
2009-07-06 13:15:35 -07:00
Brian Behlendorf d369760713 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-07-06 13:14:41 -07:00
Brian Behlendorf 326bb586bd Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-07-06 13:13:20 -07:00
Brian Behlendorf 01c3cfc58f Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
Conflicts:

	module/zfs/zil.c
2009-07-06 13:12:23 -07:00
Brian Behlendorf 3ada0935a3 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-07-06 13:11:56 -07:00
Brian Behlendorf a1ccb00b7e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
	module/zfs/zil.c
2009-07-06 13:11:34 -07:00
Brian Behlendorf c66757e332 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/fletcher.c
2009-07-02 17:07:06 -07:00
Brian Behlendorf a06a428e15 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
Conflicts:

	cmd/zdb/zdb_il.c
	cmd/zinject/zinject.c
	lib/libzfs/libzfs_graph.c
	module/zcommon/include/sys/fm/fs/zfs.h
	module/zcommon/include/zfs_deleg.h
	module/zcommon/include/zfs_namecheck.h
	module/zcommon/zfs_deleg.c
	module/zcommon/zfs_namecheck.c
	module/zcommon/zprop_common.c
	module/zfs/dmu_object.c
	module/zfs/dsl_prop.c
	module/zfs/fletcher.c
	module/zfs/include/sys/dsl_deleg.h
	module/zfs/include/sys/dsl_prop.h
	module/zfs/include/sys/metaslab_impl.h
	module/zfs/include/sys/spa_boot.h
	module/zfs/include/sys/zap.h
	module/zfs/include/sys/zap_impl.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ctldir.h
	module/zfs/include/sys/zfs_dir.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/spa_errlog.c
	module/zfs/spa_history.c
	module/zfs/zap.c
	module/zfs/zap_leaf.c
	module/zfs/zap_micro.c
2009-07-02 17:06:20 -07:00
Brian Behlendorf 9550da2ba6 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
Conflicts:

	module/zfs/arc.c
	module/zfs/zio.c
2009-07-02 16:58:33 -07:00
Brian Behlendorf 44703f0029 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/arc.c
	module/zfs/spa.c
2009-07-02 16:57:09 -07:00
Brian Behlendorf eb0137f395 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/arc.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_pool.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c
2009-07-02 16:55:22 -07:00
Brian Behlendorf a5a71d128d Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/spa.c
2009-07-02 16:52:07 -07:00
Brian Behlendorf e2b2597751 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	cmd/zdb/zdb_il.c
	cmd/zfs/zfs_main.c
	cmd/zinject/zinject.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_graph.c
	module/zcommon/include/sys/fm/fs/zfs.h
	module/zcommon/include/zfs_deleg.h
	module/zcommon/include/zfs_namecheck.h
	module/zcommon/zfs_deleg.c
	module/zcommon/zfs_namecheck.c
	module/zcommon/zprop_common.c
	module/zfs/arc.c
	module/zfs/dmu.c
	module/zfs/dmu_object.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_pool.c
	module/zfs/dsl_prop.c
	module/zfs/fletcher.c
	module/zfs/include/sys/dsl_deleg.h
	module/zfs/include/sys/dsl_prop.h
	module/zfs/include/sys/metaslab_impl.h
	module/zfs/include/sys/spa_boot.h
	module/zfs/include/sys/zap.h
	module/zfs/include/sys/zap_impl.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ctldir.h
	module/zfs/include/sys/zfs_dir.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/spa.c
	module/zfs/spa_errlog.c
	module/zfs/spa_history.c
	module/zfs/zap.c
	module/zfs/zap_leaf.c
	module/zfs/zap_micro.c
	module/zfs/zfs_ioctl.c
	module/zfs/zio.c
2009-07-02 16:49:11 -07:00
Brian Behlendorf e9f14862a5 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/dmu_objset.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/vdev_label.c
	module/zfs/zio.c
2009-07-02 16:18:03 -07:00
Brian Behlendorf 9babb37438 Rebase master to b117 2009-07-02 15:44:48 -07:00
Brian Behlendorf bfa8b02c2c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-01 11:10:37 -07:00
Brian Behlendorf d4721058bc Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-01 11:10:36 -07:00
Brian Behlendorf 8c684c8d85 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-01 11:10:24 -07:00
Brian Behlendorf ef0a712858 Distro friendly build system / packaging improvements.
These changes bring the zfs-0.4.4 tree in to compliance with
the spl-0.4.4 packaging changes.  The bottom line is 2 source
rpms and 4 binary rpms will now be generated when creating
packages there will be:

zfs-<version>.src.rpm
- Fully rebuildable source rpm for libzfs and utils.
zfs-modules-<version>.src.rpm
- Fully rebuildable source rpm for kernel modules.

zfs-<version>.<arch>.rpm
- Binary rpm for libzfs and utils.  The utils in this package are
  compatible with all zfs-module rpms of the same version.
zfs-devel-<version>.<arch>.rpm
- Binary rpm containing headers for building against libzfs libraries.

zfs-modules-<verion>-<kernel>.arch.rpm
- Binary rpm containing the kernel modules for a specific kernel build.
  The package name contains the kernel version and you should have one
  of these packages installed to match every kernel on your system.
zfs-modules-devel-<verion>-<kernel>.arch.rpm
- Binary rpm containing development header and module symbols needed
  for building additional kernel modules which are dependent on the
  zfs module stack.

Expect minor interations on these changes as I validate they work
properly on CHAOS, RHEL, Fedora, and SLES style distros.
2009-07-01 10:53:05 -07:00
Brian Behlendorf 26bea36f61 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-06-08 13:24:19 -07:00
Brian Behlendorf 2968e197aa Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-06-08 13:24:17 -07:00
Brian Behlendorf 96da8b0db7 Add missing EXPORT_SYMBOL() to dmu_tx_callback_register(). 2009-06-08 13:08:14 -07:00
Brian Behlendorf cc5ce72296 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-20 13:26:38 -07:00
Brian Behlendorf f47473638b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-20 13:26:36 -07:00
Brian Behlendorf 9bee47e648 Export additional txg_* symbols. 2009-03-20 13:17:23 -07:00
Brian Behlendorf 8c8e10d491 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-19 21:30:35 -07:00
Brian Behlendorf 18569f4b9e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-19 21:30:34 -07:00
Brian Behlendorf 61914d7403 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-19 21:30:15 -07:00
Brian Behlendorf bd1685ee4e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 21:28:51 -07:00
Brian Behlendorf 1769e10f17 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-03-19 21:28:50 -07:00
Brian Behlendorf 6d883d7d40 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-03-19 21:28:48 -07:00
Brian Behlendorf fed604c844 Add extra () requested by gcc 2009-03-19 21:18:54 -07:00
Brian Behlendorf 57c6cf3c4c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-19 21:08:41 -07:00
Brian Behlendorf bf3d911bc1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-19 21:08:39 -07:00
Brian Behlendorf 275f4aae5d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:

	module/zfs/dmu_tx.c
2009-03-19 21:08:17 -07:00
Brian Behlendorf e7f02d3b41 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 20:59:33 -07:00
Brian Behlendorf eb811f7fa9 Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:

	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00