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

2251 Commits

Author SHA1 Message Date
Brian Behlendorf aa636ae442 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-08 09:16:07 -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 28718acdab Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-07 17:13:35 -07:00
Brian Behlendorf 756d013735 Disable autoexpand notifing sysevent which is not supported. 2009-07-07 17:06:27 -07:00
Brian Behlendorf 85f46e8651 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-07 16:35:05 -07:00
Brian Behlendorf dd1e80c3c5 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-07 16:34:26 -07:00
Brian Behlendorf dc5a90a00d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-07 16:33:35 -07:00
Brian Behlendorf b9813a2a75 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-07 16:33:24 -07:00
Brian Behlendorf 056bbc39b4 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-07 16:33:10 -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 68a0ba0bc3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-07 16:32:35 -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 3c42220ce1 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-07 16:31:22 -07:00
Brian Behlendorf 67e2052f52 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-07 16:31:01 -07:00
Brian Behlendorf b6cf87b32d Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-07 16:30:58 -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 83bdfba9ad Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-07 16:13:12 -07:00
Brian Behlendorf 8b74968f01 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-07 16:12:37 -07:00
Brian Behlendorf 0e70c1ff85 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-07 16:11:49 -07:00
Brian Behlendorf 82ad66258e Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-07 16:11:37 -07:00
Brian Behlendorf d9a91bf46b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-07 16:11:24 -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 f6880f590e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-07 16:10:52 -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 39ab61050e Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-07 16:09:42 -07:00
Brian Behlendorf e122a47cd8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-07 16:09:19 -07:00
Brian Behlendorf b8af4a2181 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-07 16:09:16 -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 09184991f6 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-07 15:54:35 -07:00
Brian Behlendorf cc12f23682 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-07 15:53:55 -07:00
Brian Behlendorf f24d102540 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-07 15:53:02 -07:00
Brian Behlendorf 21fa8cfb5d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-07 15:52:48 -07:00
Brian Behlendorf 190d24ca6b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-07 15:52:35 -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 71a479fb53 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-07 15:51:59 -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 f51ac052ef Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-07 15:50:42 -07:00
Brian Behlendorf 795d799358 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-07 15:50:19 -07:00
Brian Behlendorf 4abc33bbe4 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-07 15:50:16 -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 20989cd4f2 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-06 17:01:43 -07:00
Brian Behlendorf e49bdb470e Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-06 17:01:42 -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 621679fec6 Update to use dmu_read() instead of dmu_read_impl() now that a 'flags' 
argument is available.  This flags argument was added to allow a clean
API for disabling prefetch, so I'll update zpios to use it in preference
to the module option hack used before.
 2009-07-06 16:51:59 -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 07a56371aa Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 
Conflicts:

	module/zfs/zfs_vfsops.c
 2009-07-06 15:17:38 -07:00
Brian Behlendorf a6b1465e30 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 
Conflicts:

	module/zfs/include/sys/zfs_fuid.h
	module/zfs/zfs_fuid.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_vfsops.c
	module/zfs/zfs_znode.c
 2009-07-06 15:16:54 -07:00
Brian Behlendorf d65102b493 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-06 15:08:57 -07:00
Brian Behlendorf 2b582c34cb Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 
Conflicts:

	module/zfs/zfs_ioctl.c
 2009-07-06 15:03:54 -07:00
Brian Behlendorf f48b799f78 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-06 15:03:09 -07:00
Brian Behlendorf b56250900b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-06 15:02:55 -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 4fa3570131 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-06 13:47:16 -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 4a7761abd2 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-06 13:43:07 -07:00
Brian Behlendorf 149c4b2731 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:

	cmd/ztest/ztest.c
	lib/libzfs/libzfs_pool.c
	module/zcommon/zfs_namecheck.c
	module/zfs/dmu.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
	module/zfs/zfs_fuid.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_vfsops.c
	module/zfs/zfs_znode.c
 2009-07-06 13:40:29 -07:00
Brian Behlendorf e3d05c97eb Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-06 13:17:32 -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 4539acb1cd Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-07-06 13:13:25 -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 eaba5df9af Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-07-06 13:12:44 -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 bc330e731d Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2009-07-02 16:59:46 -07:00
Brian Behlendorf 244d656e28 Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 
Conflicts:

	module/zfs/dmu.c
 2009-07-02 16:59:39 -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 df388bfc0a Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-01 11:11:48 -07:00
Brian Behlendorf 94390a0793 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-01 11:11:27 -07:00
Brian Behlendorf 10c43094ed Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-01 11:10:58 -07:00
Brian Behlendorf 3c96976b99 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-01 11:10:51 -07:00
Brian Behlendorf 212ecc6560 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-01 11:10:44 -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 a37fb966bd Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-01 11:10:25 -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 7262d13e72 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-01 11:09:45 -07:00
Brian Behlendorf b44445a8f1 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-01 11:09:33 -07:00
Brian Behlendorf fa91b5d59b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-01 11:09:31 -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 737a6ba81a Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-06-08 13:23:40 -07:00
Brian Behlendorf 041457706f Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-06-08 13:23:35 -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 9806b5c02b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-20 13:26:18 -07:00
Brian Behlendorf 6bf1e782f4 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-20 13:26:16 -07:00
Brian Behlendorf 9bee47e648 Export additional txg_* symbols. 2009-03-20 13:17:23 -07:00
Brian Behlendorf f764039e87 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 21:32:26 -07:00
Brian Behlendorf aee87a5ab6 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-19 21:31:54 -07:00
Brian Behlendorf b58bf81e15 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-19 21:31:06 -07:00
Brian Behlendorf 4298933698 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-19 21:30:56 -07:00
Brian Behlendorf a85dce5add Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-19 21:30:46 -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 cc0a015671 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-19 21:30:17 -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 30eaed5564 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-19 21:29:14 -07:00
Brian Behlendorf 56d18263ed Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-19 21:28:54 -07:00
Brian Behlendorf 0ebc97288a Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-19 21:28:52 -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 4f2dfa3c94 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 21:13:11 -07:00
Brian Behlendorf 665c272091 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-19 21:11:35 -07:00
Brian Behlendorf f87494c866 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 
Conflicts:

	module/zfs/txg.c
 2009-03-19 21:10:40 -07:00
Brian Behlendorf b08807315c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-19 21:09:02 -07:00
Brian Behlendorf 4ed190513e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-19 21:08:51 -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 0173e5dce7 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-19 21:08:22 -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 cc4c1dbc8d Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-19 21:06:25 -07:00
Brian Behlendorf 00d8d21f51 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-19 21:06:15 -07:00
Brian Behlendorf 7f33364d3c Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
	module/zfs/dmu_tx.c
	module/zfs/txg.c
 2009-03-19 21:03:58 -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
Brian Behlendorf f180959bac Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-03-19 20:51:18 -07:00
Brian Behlendorf 29703a5b4e Add 'feature-commit-cb' branch for DMU commit callbacks. 2009-03-19 20:30:14 -07:00
Brian Behlendorf a9eba02cdb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 15:31:53 -07:00
Brian Behlendorf d7243f7729 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-19 15:31:32 -07:00
Brian Behlendorf d751357f54 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-19 15:31:04 -07:00
Brian Behlendorf 7c39f7c920 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-19 15:30:57 -07:00
Brian Behlendorf a2a33f17e4 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-19 15:30:50 -07:00
Brian Behlendorf 852952d742 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-19 15:30:44 -07:00
Brian Behlendorf 146fb170ef Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-19 15:30:43 -07:00
Brian Behlendorf 86681399b8 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-19 15:30:33 -07:00
Brian Behlendorf e1540e9cbb Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-19 15:30:32 -07:00
Brian Behlendorf e75034b8e9 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-19 15:29:52 -07:00
Brian Behlendorf 7e8fa40f4d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-19 15:29:38 -07:00
Brian Behlendorf aa729c745c Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-19 15:29:36 -07:00
Brian Behlendorf db3436fafe Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 15:29:35 -07:00
Brian Behlendorf 2518c98d9e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-19 15:29:34 -07:00
Brian Behlendorf c8c4948d00 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2009-03-19 15:29:33 -07:00
Brian Behlendorf 60d25f4b93 The patch resolves the extra call to dnode_cons() in dnode_create(). 
The extra call to the constructor was there to reinitialize the non-
trivial primatives in the dnode (lists, mutexs, condvars, avl tree, etc).
This was safe, although not exactly clean, on Solaris because none of
the primitives allocate memory.  In the Linux port this is not true.
To keep stack usage to a minimum several of the primatives dynamically
allocate memory thus initializing them twice results in a memory leak.

This patch resolves this problem for Solaris and Linux by ensuring all
*_inits are called in the constructor, and all *_destroys are called
in the destructor.  Additionally we ensure that all dnode objects are
properly deconstructed before being freed to the slab, and when the
objects are allocated from the slab all required data members are
explicity initialized to correct values.
 2009-03-19 15:22:48 -07:00
Brian Behlendorf 70c010a7ac Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-19 15:09:47 -07:00
Brian Behlendorf c495a4bd1f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-19 15:09:24 -07:00
Brian Behlendorf 2a5c75d514 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-19 15:08:54 -07:00
Brian Behlendorf 8b0f4fa45c Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-19 15:08:46 -07:00
Brian Behlendorf b313904c89 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-19 15:08:39 -07:00
Brian Behlendorf f36defdaa7 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-19 15:08:31 -07:00
Brian Behlendorf 0b74b5ae59 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-19 15:08:30 -07:00
Brian Behlendorf 099dd7e175 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-19 15:08:18 -07:00
Brian Behlendorf fd3db92fe7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-19 15:08:17 -07:00
Brian Behlendorf 5a85b97928 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-19 15:07:35 -07:00
Brian Behlendorf 8cdd340206 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-19 15:07:21 -07:00
Brian Behlendorf fac4873ad7 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-19 15:07:19 -07:00
Brian Behlendorf 90bbbd109b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 15:07:19 -07:00
Brian Behlendorf f07d61a8c1 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-19 15:07:18 -07:00
Brian Behlendorf cc032b6337 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-03-19 15:07:16 -07:00
Brian Behlendorf 9bbf8f1761 Resolve conflict with fix-dnode-cons 2009-03-19 15:02:05 -07:00
Brian Behlendorf 1c925dc4ce Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-17 16:33:47 -07:00
Brian Behlendorf 02424a268b Use spl_device_* macro's for portability. 2009-03-17 16:27:57 -07:00
Brian Behlendorf 015c4a4deb Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-17 16:07:02 -07:00
Brian Behlendorf 1f84b8ed2c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-17 16:07:01 -07:00
Brian Behlendorf f8cd6b6b49 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-17 16:06:51 -07:00
Brian Behlendorf 80e98bb0f5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-17 16:06:50 -07:00
Brian Behlendorf a9b0088f48 Use include missing zfs_config.h and use ZFS_META_VERSION (not VERSION) 2009-03-17 16:02:09 -07:00
Brian Behlendorf a0155baaa9 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-03-17 15:25:57 -07:00
Brian Behlendorf 23c544c884 Add zfs_config.h include for HAVE_2ARGS_BIO_END_IO_T define 2009-03-17 15:14:02 -07:00
Brian Behlendorf da843563aa Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-16 16:23:03 -07:00
Brian Behlendorf 563c0614c4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-16 16:22:19 -07:00
Brian Behlendorf b7f6b6e19d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-16 16:21:15 -07:00
Brian Behlendorf 4bcfe17f4d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-16 16:21:00 -07:00
Brian Behlendorf c72f5112d3 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-16 16:20:45 -07:00
Brian Behlendorf f7087f0431 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-16 16:20:30 -07:00
Brian Behlendorf f073f197bc Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-16 16:20:29 -07:00
Brian Behlendorf 7ca5472963 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-16 16:20:03 -07:00
Brian Behlendorf 5edabb999f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-16 16:20:02 -07:00
Brian Behlendorf 11d99f4112 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-16 16:18:27 -07:00
Brian Behlendorf f28a31a09a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-16 16:18:01 -07:00
Brian Behlendorf 61926abf0f Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-16 16:17:58 -07:00
Brian Behlendorf df985d53db Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-16 16:17:57 -07:00
Brian Behlendorf f86b52a39d Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-16 16:17:55 -07:00
Brian Behlendorf 3eebe1bd0e Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-16 16:17:54 -07:00
Brian Behlendorf 3eb4ba3ebd Add 3 more uninit errors detected by gcc 3.4.0 compiler. 2009-03-16 16:06:50 -07:00
Brian Behlendorf 709c447ce6 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-16 11:41:18 -07:00
Brian Behlendorf 7bca8f1926 Use vmem_size() only on i386 systems and in the kernel. 2009-03-16 11:27:26 -07:00
Brian Behlendorf b289a33e68 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-13 11:01:27 -07:00
Brian Behlendorf abfd24f708 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-13 11:00:47 -07:00
Brian Behlendorf 339553bdea Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-13 11:00:03 -07:00
Brian Behlendorf a4f8aecbe8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-13 10:59:53 -07:00
Brian Behlendorf ab636c01ec Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-13 10:59:42 -07:00
Brian Behlendorf 344e59a582 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-13 10:59:32 -07:00
Brian Behlendorf b60dd0bdd7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-13 10:59:31 -07:00
Brian Behlendorf f21bd57c48 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-13 10:59:15 -07:00
Brian Behlendorf adf984639d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-13 10:59:14 -07:00
Brian Behlendorf d3afa01aa9 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-13 10:58:14 -07:00
Brian Behlendorf d7f60ff869 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-13 10:57:50 -07:00
Brian Behlendorf 648bbdebbe Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-13 10:57:47 -07:00
Brian Behlendorf 486df2d11d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-13 10:57:46 -07:00
Brian Behlendorf 36c46c6031 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-13 10:57:45 -07:00
Brian Behlendorf d2910d2415 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-03-13 10:57:43 -07:00
Brian Behlendorf c98996ded8 Explicitly cast to prevent 'void *' dereference. 2009-03-13 10:51:11 -07:00
Brian Behlendorf d032066bf3 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-12 10:51:22 -07:00
Brian Behlendorf b625eab814 Move upcall after run_args are initialized. 2009-03-12 10:46:54 -07:00
Brian Behlendorf bb06faa046 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 10:40:54 -07:00
Brian Behlendorf 58e63ca4cc Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-12 10:40:17 -07:00
Brian Behlendorf 7f8c9b233a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-12 10:39:34 -07:00
Brian Behlendorf 71188348b0 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-12 10:39:26 -07:00
Brian Behlendorf e0b048a823 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-12 10:39:17 -07:00
Brian Behlendorf 8206ed9aea Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-12 10:39:00 -07:00
Brian Behlendorf 4d0f64844d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-12 10:38:59 -07:00
Brian Behlendorf 5303323f3a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-12 10:38:45 -07:00
Brian Behlendorf 2ff032fd60 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 10:38:44 -07:00
Brian Behlendorf bccbb40991 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-12 10:37:33 -07:00
Brian Behlendorf 9bdbd7c8f7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 10:37:18 -07:00
Brian Behlendorf c8368a8daa Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-12 10:37:15 -07:00
Brian Behlendorf b9b399bf04 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 10:37:14 -07:00
Brian Behlendorf a03187bb3b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 10:37:12 -07:00
Brian Behlendorf f8fe8a76f4 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-12 10:37:11 -07:00
Brian Behlendorf cabd4a69c4 Resolve remaining uninitialized variables 
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
 2009-03-12 10:30:41 -07:00
Brian Behlendorf a59f378c54 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-12 10:03:31 -07:00
Brian Behlendorf 308903afa4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-12 10:02:53 -07:00
Brian Behlendorf 8feb346bcd Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-12 10:02:13 -07:00
Brian Behlendorf 0c2f0dd6be Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-12 10:02:05 -07:00
Brian Behlendorf 2a002fd082 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-12 10:01:56 -07:00
Brian Behlendorf 7605051f07 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-12 10:01:43 -07:00
Brian Behlendorf a4b92c0710 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-12 10:01:41 -07:00
Brian Behlendorf cebf08458e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-12 10:01:27 -07:00
Brian Behlendorf 165b2611d2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 10:01:25 -07:00
Brian Behlendorf ac9df9b68b Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-12 10:00:24 -07:00
Brian Behlendorf 0cdc14e427 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 10:00:07 -07:00
Brian Behlendorf a459fe3e3f Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-12 10:00:05 -07:00
Brian Behlendorf dd30dba016 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 10:00:04 -07:00
Brian Behlendorf 193ea156e9 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 10:00:03 -07:00
Brian Behlendorf eceaf813ad Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-03-12 10:00:01 -07:00
Brian Behlendorf f2d72af596 Add remaining missing cases (or a default) to all switch statements. 
The previous code was not wrong, but this prevents gcc from warning
us about missing cases for these known safe switch statements.  The
-Wno-missing-cases can now be removed to detect places where we
accidentally forgot a case.
 2009-03-12 09:53:08 -07:00
Brian Behlendorf 0d19b2613b Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-11 22:50:31 -07:00
Brian Behlendorf 7dda95296c Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 22:50:29 -07:00
Brian Behlendorf ef003a41c3 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 22:50:02 -07:00
Brian Behlendorf 68818f8c51 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 22:49:33 -07:00
Brian Behlendorf 7ffff81846 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-11 22:49:26 -07:00
Brian Behlendorf 08a409f648 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 22:49:17 -07:00
Brian Behlendorf ec7bd3f401 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 22:49:10 -07:00
Brian Behlendorf 882ac1e50f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 22:49:09 -07:00
Brian Behlendorf f9494814c2 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 22:48:56 -07:00
Brian Behlendorf dadb99c29a Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 22:48:55 -07:00
Brian Behlendorf c47399ecf6 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-11 22:48:11 -07:00
Brian Behlendorf 901d2a8d13 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 22:47:58 -07:00
Brian Behlendorf 1b9605212b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-11 22:47:56 -07:00
Brian Behlendorf 909582a95e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 22:47:56 -07:00
Brian Behlendorf 6211d1a370 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 22:47:54 -07:00
Brian Behlendorf a2dc88da2a Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-03-11 22:47:53 -07:00
Brian Behlendorf 1c0279a08f Resolve newly revealed unused vars and symbols caused by topic branch. 2009-03-11 22:43:09 -07:00
Brian Behlendorf 462f864365 Check should be in ASSERT to minimize stack and prevent unused var. 2009-03-11 22:38:16 -07:00
Brian Behlendorf 6315decd17 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 22:30:26 -07:00
Brian Behlendorf 01c24c3a86 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 22:29:57 -07:00
Brian Behlendorf 0d081696b1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 22:29:19 -07:00
Brian Behlendorf adcaad04be Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-03-11 22:29:12 -07:00
Brian Behlendorf bc61ef667f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-11 22:29:09 -07:00
Brian Behlendorf c57d3bce5c Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 22:29:00 -07:00
Brian Behlendorf 38e76d0b22 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 22:28:48 -07:00
Brian Behlendorf e5c0a2a2f7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 22:28:47 -07:00
Brian Behlendorf 0dcd576c67 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 22:28:33 -07:00
Brian Behlendorf cb75043186 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 22:28:31 -07:00
Brian Behlendorf ada5743876 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-11 22:27:35 -07:00
Brian Behlendorf 24e488aa55 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 22:27:18 -07:00
Brian Behlendorf e6941c57fe Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-11 22:27:16 -07:00
Brian Behlendorf e625efa701 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 22:27:15 -07:00
Brian Behlendorf c9daa4fbd2 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 22:27:14 -07:00
Brian Behlendorf 246cae3509 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-03-11 22:27:11 -07:00
Brian Behlendorf 25c88fda18 Remove unused variable 2009-03-11 22:15:36 -07:00
Brian Behlendorf ecd2dbcb44 Resolve upstream unused variables so we can remove the -Wno-unused 
compile option.  In most case the variables are only unused when
debugging is disabled (ASSERT) however they do waste stack if that
case if the compiler doesn't optimize it out (it should).  But more
importantly disabling this warning prevent us from noticing legit
unused variables accidentally left in other place of the code.
 2009-03-11 22:07:25 -07:00
Brian Behlendorf cb52b25a43 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 21:03:09 -07:00
Brian Behlendorf 9326966d34 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 21:02:37 -07:00
Brian Behlendorf 72ae0af5c9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 21:01:55 -07:00
Brian Behlendorf b4ab230f6a Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-11 21:01:45 -07:00
Brian Behlendorf 8d06511a29 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 21:01:35 -07:00
Brian Behlendorf f88492180c Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 21:01:22 -07:00
Brian Behlendorf e140466d9c Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 21:01:21 -07:00
Brian Behlendorf 60a37cc531 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 21:01:05 -07:00
Brian Behlendorf b6616bd2c6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 21:01:03 -07:00
Brian Behlendorf c37cad07c9 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-11 21:00:05 -07:00
Brian Behlendorf c351352990 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 20:59:46 -07:00
Brian Behlendorf e0eecbc272 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-11 20:59:45 -07:00
Brian Behlendorf 4c042de40b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 20:59:43 -07:00
Brian Behlendorf 60ac8152fe Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 20:59:42 -07:00
Brian Behlendorf 9915249546 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-03-11 20:53:11 -07:00
Brian Behlendorf d4dbc7dca8 Resolve all instances of missing braces. 2009-03-11 20:52:21 -07:00
Brian Behlendorf f6ef07fab5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 16:28:01 -07:00
Brian Behlendorf 2b85d248b9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 16:28:00 -07:00
Brian Behlendorf c9323d991b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-11 16:27:48 -07:00
Brian Behlendorf cfbbf79eeb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 16:27:47 -07:00
Ricardo M. Correia 8680138968 Add missing EXPORT_SYMBOL() macro. 
ZFS consumers such as Lustre should have access to these symbols.
 2009-03-11 16:22:11 -07:00
Brian Behlendorf f39adcbb54 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-03-11 14:44:59 -07:00
Brian Behlendorf 76052e446c Revert 'linux-have-xdr' topic branch patch. 
This is not needed anymore since a proper XDR implementation was added
to the SPL as of version spl-0.4.3.
 2009-03-11 14:39:10 -07:00
Brian Behlendorf b2041bc8ef Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 14:13:33 -07:00
Brian Behlendorf bd92e256e6 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 14:12:52 -07:00
Brian Behlendorf 34f01d7e28 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 14:12:00 -07:00
Brian Behlendorf f6fe1c9ee9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-11 14:11:44 -07:00
Brian Behlendorf 1d544f4131 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 14:11:31 -07:00
Brian Behlendorf 94dfc4263d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-11 14:11:18 -07:00
Brian Behlendorf 5bc6a80f81 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 14:11:04 -07:00
Brian Behlendorf 3d59bda174 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 14:11:03 -07:00
Brian Behlendorf 44bbf3d55a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 14:10:41 -07:00
Brian Behlendorf ab760deda7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 14:10:39 -07:00
Brian Behlendorf 4c29021e05 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-11 14:09:23 -07:00
Brian Behlendorf 5afc3db3ce Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 14:08:57 -07:00
Brian Behlendorf 9f76497933 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-11 14:08:53 -07:00
Brian Behlendorf 1ca6578ebc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 14:08:51 -07:00
Brian Behlendorf 8a3b1a5ff5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 14:08:50 -07:00
Brian Behlendorf e5011401cd Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-03-11 14:08:48 -07:00
Brian Behlendorf 3226eea157 Resolve additional cases where gcc wants extra parenthesis. 
These were introduced by the rebase to b108.
 2009-03-11 13:57:47 -07:00
Brian Behlendorf 0479ea4c30 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 13:28:01 -07:00
Brian Behlendorf 94caad0d1f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 13:27:22 -07:00
Brian Behlendorf 2a66030fab Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 13:26:33 -07:00
Brian Behlendorf 0d1f924c2d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-11 13:26:21 -07:00
Brian Behlendorf 8c02ea3a49 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 13:26:09 -07:00
Brian Behlendorf 2510eb0d8b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-11 13:25:57 -07:00
Brian Behlendorf e5aea7e980 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 13:25:45 -07:00
Brian Behlendorf 6ffd92964e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 13:25:44 -07:00
Brian Behlendorf 02159c4359 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 13:25:24 -07:00
Brian Behlendorf 5915d545e9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 13:25:23 -07:00
Brian Behlendorf 7c9f03399c Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-11 13:24:10 -07:00
Brian Behlendorf 2369dcfc6e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 13:23:48 -07:00
Brian Behlendorf edce9778ba Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-11 13:23:46 -07:00
Brian Behlendorf 4e945fb768 Remove -Wno-unknown-pragmas compile option, all unknown pragmas 
have been removed by the gcc-ident-pragmas topic branch.
 2009-03-11 13:14:08 -07:00
Brian Behlendorf 6869252da7 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 12:48:04 -07:00
Brian Behlendorf b56b3ef9b9 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 12:47:26 -07:00
Brian Behlendorf ff34681923 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 12:46:32 -07:00
Brian Behlendorf a6faa4a39d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-11 12:46:19 -07:00
Brian Behlendorf 8cd67dabe3 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 12:46:07 -07:00
Brian Behlendorf 292abc5144 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-11 12:45:53 -07:00
Brian Behlendorf 67bb58519f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 12:45:41 -07:00
Brian Behlendorf aa3c9e30f4 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 12:45:39 -07:00
Brian Behlendorf 3cfb9e0c7d Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 12:45:16 -07:00
Brian Behlendorf 9ceea9faf2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 12:45:15 -07:00
Brian Behlendorf 5ae2b4b73e Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-11 12:43:57 -07:00
Brian Behlendorf 8da11058e7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 12:43:34 -07:00
Brian Behlendorf adf52e68be Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-11 12:43:32 -07:00
Brian Behlendorf 0cad1eaf40 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 12:43:30 -07:00
Brian Behlendorf 86baaa124e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 12:43:29 -07:00
Brian Behlendorf ced9992186 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-11 12:43:28 -07:00
Brian Behlendorf fbb2843086 Ensure idx is properly initialized in all instances. 2009-03-11 12:34:24 -07:00
Brian Behlendorf af12291488 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 
Conflicts:
	module/zfs/rrwlock.c
	module/zfs/zfs_replay.c
 2009-03-11 11:22:11 -07:00
Brian Behlendorf a55824aa6a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 11:20:15 -07:00
Brian Behlendorf 1c8bbc5fd9 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 11:19:10 -07:00
Brian Behlendorf fbe3b02667 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-11 11:18:54 -07:00
Brian Behlendorf 0eca278f8a Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 11:18:37 -07:00
Brian Behlendorf 3cc7a2814d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-11 11:18:23 -07:00
Brian Behlendorf f39cd76b0b Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 11:18:05 -07:00
Brian Behlendorf 96cc021270 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 11:18:01 -07:00
Brian Behlendorf d402ab0f39 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 11:17:38 -07:00
Brian Behlendorf 7a08ef9d52 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 
Conflicts:
	module/zfs/spa_boot.c
 2009-03-11 11:17:23 -07:00
Brian Behlendorf 0d40fb36a1 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-11 11:15:26 -07:00
Brian Behlendorf bf200630f9 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/rrwlock.c
	module/zfs/spa_boot.c
	module/zfs/zfs_replay.c
 2009-03-11 11:12:24 -07:00
Brian Behlendorf c143e6e5b9 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-11 11:09:18 -07:00
Brian Behlendorf dff484a388 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 11:09:13 -07:00
Brian Behlendorf 5f30a3cb0e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 11:09:11 -07:00
Brian Behlendorf 8fe801fd8f Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-03-11 11:00:42 -07:00
Ricardo M. Correia af45030850 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
Brian Behlendorf 2ff4ee3cae Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 10:44:51 -07:00
Brian Behlendorf 2d756b5ea3 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 10:44:10 -07:00
Brian Behlendorf a6e33547be Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-11 10:43:20 -07:00
Brian Behlendorf 4f57a6ccb6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-11 10:43:09 -07:00
Brian Behlendorf a032eaff34 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-11 10:42:57 -07:00
Brian Behlendorf da73d85b15 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-11 10:42:43 -07:00
Brian Behlendorf a3da614c79 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-11 10:42:31 -07:00
Brian Behlendorf 4231a48b17 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-11 10:42:30 -07:00
Brian Behlendorf 5f4e78b6cc Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-11 10:42:10 -07:00
Brian Behlendorf 5067076033 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 10:42:09 -07:00
Brian Behlendorf e33fa6011f Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-11 10:40:58 -07:00
Brian Behlendorf 73c738d1ce Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 10:40:37 -07:00
Brian Behlendorf 1cb08d7cfc Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-11 10:40:34 -07:00
Brian Behlendorf 8eaf19dae8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 10:40:33 -07:00
Brian Behlendorf d43e9ca262 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 10:40:31 -07:00
Brian Behlendorf d641369d38 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-03-11 10:32:45 -07:00
Ricardo M. Correia fd9a7a0fb4 Add 'ull' suffix to 64-bit constants. 2009-03-11 10:31:24 -07:00
Brian Behlendorf 851cd16a32 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-10 21:51:06 -07:00
Brian Behlendorf c0c0c27632 Build system and packaging (RPM support) (Part 3) 
Complete support for dist install srpm and rpm make targets.
 2009-03-10 21:45:50 -07:00
Brian Behlendorf 89719f5398 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-10 21:42:31 -07:00
Brian Behlendorf 7f0ca09791 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-10 21:42:00 -07:00
Brian Behlendorf 63b33d3e07 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-10 21:41:17 -07:00
Brian Behlendorf f48c3c25ea Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-10 21:41:06 -07:00
Brian Behlendorf 2d67f609f3 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-10 21:40:56 -07:00
Brian Behlendorf 05a46e2f68 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-10 21:40:46 -07:00
Brian Behlendorf 55dcb5b609 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-10 21:40:37 -07:00
Brian Behlendorf a03a940a3b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-10 21:40:35 -07:00
Brian Behlendorf 5f6f34dbea Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-10 21:40:20 -07:00
Brian Behlendorf 952e70b1a0 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-10 21:40:19 -07:00
Brian Behlendorf a81ad4ecb8 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-10 21:39:22 -07:00
Brian Behlendorf 048d7dcc06 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-10 21:39:03 -07:00
Brian Behlendorf f2499f448a Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-10 21:39:00 -07:00
Brian Behlendorf 4911b7be4d zpios subdir should be on linux-zpios branch 2009-03-10 21:33:24 -07:00
Brian Behlendorf 66a5ec0f7b Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-10 21:30:48 -07:00
Brian Behlendorf 6bf18caf9f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 
Conflicts:

	module/Makefile.in
 2009-03-10 21:29:58 -07:00
Brian Behlendorf 88f71167ae Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-10 21:28:14 -07:00
Brian Behlendorf be8904440b Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-10 21:28:01 -07:00
Brian Behlendorf 370b674e09 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-10 21:27:49 -07:00
Brian Behlendorf f65339a529 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-03-10 21:27:34 -07:00
Brian Behlendorf 799aae7107 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-10 21:27:22 -07:00
Brian Behlendorf 729130ffaa Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-10 21:27:20 -07:00
Brian Behlendorf e1a4d1e88a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-10 21:27:01 -07:00
Brian Behlendorf e610bf6e09 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-10 21:26:59 -07:00
Brian Behlendorf 8bf4b3eeda Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-10 21:25:48 -07:00
Brian Behlendorf 36860ec1a8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:

	module/Makefile.in
 2009-03-10 21:23:17 -07:00
Brian Behlendorf 11bcfaa5ef Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-10 21:22:15 -07:00
Brian Behlendorf c8e569dd1c Build system and packaging (RPM support) (Part 2) 
Complete support for dist install srpm and rpm make targets.
 2009-03-10 21:13:30 -07:00
Brian Behlendorf 7eeec4808a Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-20 14:33:26 -08:00
Brian Behlendorf 4d28f29b6c Update profile scripts with additional upcalls for fine grained profiling 2009-02-20 14:28:00 -08:00
Brian Behlendorf 43fb0282da Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-19 14:41:00 -08:00
Brian Behlendorf d51fcd107f Remove useless run_args->regions check which was always true 2009-02-19 14:35:41 -08:00
Brian Behlendorf d3f070026f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-19 13:02:01 -08:00
Brian Behlendorf 23710f1308 Minor zpios cleanup plus addition of --nowait feature 2009-02-19 12:56:50 -08:00
Brian Behlendorf c0fce9bde6 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-02-18 16:40:34 -08:00
Brian Behlendorf a2b17c5744 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-18 16:39:57 -08:00
Brian Behlendorf aab28d7a6e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-18 16:39:06 -08:00
Brian Behlendorf a21e67a4af Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-02-18 16:38:54 -08:00
Brian Behlendorf 359141b50e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-02-18 16:38:40 -08:00
Brian Behlendorf a983057c58 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 16:38:28 -08:00
Brian Behlendorf 2cbe1d0785 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-02-18 16:38:16 -08:00
Brian Behlendorf fab643a25b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-02-18 16:38:15 -08:00
Brian Behlendorf ac79872526 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-02-18 16:37:56 -08:00
Brian Behlendorf 87245deaab Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 16:37:54 -08:00
Brian Behlendorf a8edc189e5 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-02-18 16:36:45 -08:00
Brian Behlendorf 04f4045077 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-18 16:36:25 -08:00
Brian Behlendorf e898182f62 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-18 16:36:21 -08:00
Brian Behlendorf b57a283336 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 16:36:19 -08:00
Brian Behlendorf d53b9a34ea Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 16:36:17 -08:00
Brian Behlendorf e6c50e7136 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-02-18 16:36:16 -08:00
Brian Behlendorf a0ef7f5826 C90 fixes int declared in for() is a C99 construct 2009-02-18 16:30:01 -08:00
Brian Behlendorf 9f2e9c5a87 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-02-18 16:24:45 -08:00
Brian Behlendorf ccdc0e2d04 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-18 16:24:06 -08:00
Brian Behlendorf faae1c55fb Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-18 16:23:15 -08:00
Brian Behlendorf 4df2e94a2d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-02-18 16:23:03 -08:00
Brian Behlendorf de8cca1a9f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-02-18 16:22:50 -08:00
Brian Behlendorf 7f52d6ee41 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 16:22:36 -08:00
Brian Behlendorf c44051f635 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-02-18 16:22:25 -08:00
Brian Behlendorf 9aab96eb9d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-02-18 16:22:23 -08:00
Brian Behlendorf b976733285 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-02-18 16:22:03 -08:00
Brian Behlendorf b4b7da1314 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 16:22:02 -08:00
Brian Behlendorf 21b7dd76d1 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-02-18 16:20:57 -08:00
Brian Behlendorf 4119aba847 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-18 16:20:38 -08:00
Brian Behlendorf c80011c473 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-18 16:20:35 -08:00
Brian Behlendorf 6c4c486b9e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 16:20:33 -08:00
Brian Behlendorf c1d525d6e9 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-02-18 16:20:32 -08:00
Brian Behlendorf fd9fdb78c6 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 16:20:30 -08:00
Brian Behlendorf f07954ef8a Pass 0's instead of NULL's which are the same but of the correct type 2009-02-18 16:14:20 -08:00
Brian Behlendorf eb3d5e7051 Local try should be in this patch 2009-02-18 14:47:06 -08:00
Brian Behlendorf 7b8eca908f Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 
Conflicts:

	cmd/zpool/zpool_main.c
 2009-02-18 14:38:20 -08:00
Brian Behlendorf b3d7657ea0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-18 14:37:01 -08:00
Brian Behlendorf ba8fc98d00 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-02-18 14:36:04 -08:00
Brian Behlendorf 3d4185ed1d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-02-18 14:35:43 -08:00
Brian Behlendorf d9229ad643 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-02-18 14:35:32 -08:00
Brian Behlendorf a278e153c4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 14:35:20 -08:00
Brian Behlendorf 47c6526993 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-02-18 14:35:09 -08:00
Brian Behlendorf 8241395b5a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-02-18 14:35:05 -08:00
Brian Behlendorf 855a863bb2 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-02-18 14:34:48 -08:00
Brian Behlendorf 9f4865e4ca Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 14:34:45 -08:00
Brian Behlendorf 6c27c02cf2 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-02-18 14:33:38 -08:00
Brian Behlendorf 8090a9a908 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 
Conflicts:

	cmd/zpool/zpool_main.c
 2009-02-18 14:31:46 -08:00
Brian Behlendorf c893c7cf3d Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-02-18 14:30:56 -08:00
Brian Behlendorf 7872d84be6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 14:30:54 -08:00
Brian Behlendorf 87307ab12a Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-02-18 14:30:48 -08:00
Brian Behlendorf dbc3a5ec55 Merge commit 'refs/top-bases/fix-list' into fix-list 
Conflicts:

	module/zfs/arc.c
 2009-02-18 14:29:48 -08:00
Brian Behlendorf 3ef12f42a2 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-02-18 14:29:23 -08:00
Brian Behlendorf 7fe1b71533 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-02-18 14:29:19 -08:00
Brian Behlendorf d6e8154947 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-02-18 14:28:30 -08:00
Brian Behlendorf 404fd8578f Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-02-18 14:28:27 -08:00
Brian Behlendorf 6fe19bd252 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
 2009-02-18 14:28:15 -08:00
Brian Behlendorf 3ac1fca8dc Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-02-18 14:27:31 -08:00
Brian Behlendorf f0a8aedfbc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
 2009-02-18 14:27:12 -08:00
Brian Behlendorf 3eb7fa9afd Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2009-02-18 14:04:08 -08:00
Brian Behlendorf 32d4d74b04 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-02-18 14:04:04 -08:00
Brian Behlendorf 6fa66816c1 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 
Conflicts:

	module/zfs/arc.c
 2009-02-18 14:03:55 -08:00
Brian Behlendorf 5be9e325a1 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 
Conflicts:

	module/zfs/arc.c
 2009-02-18 14:03:22 -08:00
Brian Behlendorf ba528721da Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-02-18 13:12:58 -08:00
Brian Behlendorf 0b8e48b813 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-02-18 13:12:53 -08:00
Brian Behlendorf e203e7b48f Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-02-18 13:12:35 -08:00
Brian Behlendorf f686a87058 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 
Conflicts:

	module/zfs/arc.c
 2009-02-18 13:12:26 -08:00
Brian Behlendorf 3b17164f71 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 
Conflicts:

	module/zfs/vdev.c
	module/zfs/zio.c
 2009-02-18 13:09:32 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf e47c3be7df Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-07 13:12:09 -08:00
Brian Behlendorf 4e4327a0a5 Drop the KERNEL portion of this check, just checking __i386 is correct 2009-02-07 13:10:16 -08:00
Brian Behlendorf b52f710397 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-06 10:12:34 -08:00
Brian Behlendorf c3ec929baf Ensure vmem_size() calculations are only used on __i386 or we will 
missize the arch cache on 64bit machines with the SPL.  This change
should probably be there in the Solaris version as well.
 2009-02-06 10:09:20 -08:00
Brian Behlendorf 895c8b9629 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-04 15:21:38 -08:00
Brian Behlendorf 770152bd1d Revert current code removal changes, this support now exists in the SPL. The branch is being left in place because I expect there to be other new changes soon 2009-02-04 15:19:19 -08:00
Brian Behlendorf 98674d530a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-26 16:50:32 -08:00
Brian Behlendorf 3657ada547 Update linux vdev_disk interfaces to issue multiple bios if needed due to the maximum request size being smaller than the request size passed down from the spa 2009-01-26 16:46:50 -08:00
Brian Behlendorf 92dce85827 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-21 11:02:12 -08:00
Brian Behlendorf ab8f4ca43f Convert ASSERT() to VERIFY() for better coverage 2009-01-21 10:59:06 -08:00
Brian Behlendorf ef96542acb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 16:34:51 -08:00
Brian Behlendorf 7c8ca1d516 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 16:34:13 -08:00
Brian Behlendorf 42b3648e0b Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 16:33:22 -08:00
Brian Behlendorf 8ff964a4f3 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 16:33:09 -08:00
Brian Behlendorf 93308c3507 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 16:32:56 -08:00
Brian Behlendorf 56b47e5767 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 16:32:42 -08:00
Brian Behlendorf f1300cddb7 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 16:32:30 -08:00
Brian Behlendorf f33c13d11d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 16:32:27 -08:00
Brian Behlendorf c090c8b1aa Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-15 16:32:10 -08:00
Brian Behlendorf 41cba9f136 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 16:32:08 -08:00
Brian Behlendorf ea2c8a4e37 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-15 16:30:58 -08:00
Brian Behlendorf 37cc2cedde Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 16:30:38 -08:00
Brian Behlendorf b8e5edb299 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 16:30:32 -08:00
Brian Behlendorf fb256294c9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 16:30:29 -08:00
Brian Behlendorf c5b335f613 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 16:30:28 -08:00
Brian Behlendorf 31cddc8a0b Merge branch 'fix-locks' into refs/top-bases/fix-branch 2009-01-15 16:30:25 -08:00
Brian Behlendorf 50186c2b57 All init and destroy initialized pulled in 2009-01-15 16:25:25 -08:00
Brian Behlendorf 7d4fe54632 txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions 2009-01-15 16:22:23 -08:00
Brian Behlendorf 38a2cb40de Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 15:31:02 -08:00
Brian Behlendorf 50a6b919a4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 15:30:46 -08:00
Brian Behlendorf 50881047b6 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 15:30:25 -08:00
Brian Behlendorf 461fe17e5f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 15:30:20 -08:00
Brian Behlendorf 14caea82a9 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 15:30:15 -08:00
Brian Behlendorf 1724a1dd37 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 15:30:10 -08:00
Brian Behlendorf 865347e0be Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 15:30:05 -08:00
Brian Behlendorf 702ba8cdf7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 15:30:04 -08:00
Brian Behlendorf 930ef960bc Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-15 15:29:56 -08:00
Brian Behlendorf 9c8802c7e4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 15:29:55 -08:00
Brian Behlendorf 498140c4cb Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-15 15:29:26 -08:00
Brian Behlendorf 15cd579536 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:18 -08:00
Brian Behlendorf 2e84c7ae79 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 15:29:16 -08:00
Brian Behlendorf 8511545409 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:29:15 -08:00
Brian Behlendorf fa36244fba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:29:14 -08:00
Brian Behlendorf 4c0be07ad9 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:29:13 -08:00
Brian Behlendorf 22284754e0 Resolve C90 int declared in for() construct 2009-01-15 15:26:54 -08:00
Brian Behlendorf d2150abea0 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 14:53:57 -08:00
Brian Behlendorf b8709a7d90 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 14:53:41 -08:00
Brian Behlendorf 471992c1d4 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 14:53:19 -08:00
Brian Behlendorf 41c372fa3f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 14:53:14 -08:00
Brian Behlendorf 7666cb567e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 14:53:08 -08:00
Brian Behlendorf c64f23d8d7 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 14:53:02 -08:00
Brian Behlendorf c6412aa523 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 14:52:57 -08:00
Brian Behlendorf 7c879f3b8b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 14:52:56 -08:00
Brian Behlendorf 86b606d846 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-15 14:52:48 -08:00
Brian Behlendorf 141235d905 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 14:52:47 -08:00
Brian Behlendorf c5194270a0 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-15 14:52:17 -08:00
Brian Behlendorf 2763e879ec Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 14:52:08 -08:00
Brian Behlendorf b7f8d6e829 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:52:06 -08:00
Brian Behlendorf 63722ea81a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:52:04 -08:00
Brian Behlendorf 12fb73609c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:52:04 -08:00
Brian Behlendorf e23dbee181 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:52:03 -08:00
Brian Behlendorf b61295bfb6 Resolve C90 int declared in for() construct 2009-01-15 14:49:42 -08:00
Brian Behlendorf 435fa44075 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 14:40:23 -08:00
Brian Behlendorf 6479dc1921 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 14:40:07 -08:00
Brian Behlendorf 6088240364 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 14:39:47 -08:00
Brian Behlendorf a74bc899dc Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 14:39:42 -08:00
Brian Behlendorf 534224345e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 14:39:36 -08:00
Brian Behlendorf 21b9ae22f4 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 14:39:31 -08:00
Brian Behlendorf dd2e5734f7 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 14:39:26 -08:00
Brian Behlendorf 4c1ba3d379 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 14:39:25 -08:00
Brian Behlendorf 3ffbd630ad Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-15 14:39:18 -08:00
Brian Behlendorf 1a4ae03863 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 14:39:18 -08:00
Brian Behlendorf 366ade9eba Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-15 14:38:50 -08:00
Brian Behlendorf 0f392008db Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 14:38:41 -08:00
Brian Behlendorf fe7a703285 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:38:39 -08:00
Brian Behlendorf 3b6c91ec9f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:38:38 -08:00
Brian Behlendorf ec41b57eb3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:38:38 -08:00
Brian Behlendorf e9c7a643f1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:38:37 -08:00
Brian Behlendorf 77f365172c Resolve C90 int declared in for() construct 2009-01-15 14:36:27 -08:00
Brian Behlendorf 454835e259 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 14:30:55 -08:00
Brian Behlendorf 94c2ebf6f0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 14:30:40 -08:00
Brian Behlendorf b71b54c96d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-15 14:30:19 -08:00
Brian Behlendorf 7dd685ccc3 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 14:30:14 -08:00
Brian Behlendorf 46123fffa2 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-15 14:30:09 -08:00
Brian Behlendorf 39688a10b9 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-15 14:30:04 -08:00
Brian Behlendorf 574b2c897e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-15 14:29:58 -08:00
Brian Behlendorf 372dba924d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 14:29:58 -08:00
Brian Behlendorf 0eeb5ec0f5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-15 14:29:50 -08:00
Brian Behlendorf ab52989424 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 14:29:50 -08:00
Brian Behlendorf 2b725e7cc0 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-15 14:29:22 -08:00
Brian Behlendorf b83cf899ca Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 14:29:13 -08:00
Brian Behlendorf 062f1f78c6 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:29:11 -08:00
Brian Behlendorf cb55f9a832 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:29:11 -08:00
Brian Behlendorf 43b4c537eb Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:29:10 -08:00
Brian Behlendorf f969333c73 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:29:09 -08:00