Commit Graph

997 Commits

Author SHA1 Message Date
Brian Behlendorf c821af8f89 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-08 15:00:48 -07:00
Brian Behlendorf 058a25a017 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 15:00:43 -07:00
Brian Behlendorf 275d66171b Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-08 15:00:41 -07:00
Brian Behlendorf 1ab1b8502b Stop the kthread/thread/pthread mixing and matching insanity. Update all
code to only use the kthread API regardless of if it is compiled in the
kernel or user space.  The kthread API will be layered on top of pthreads
as best as possible in zfs_context, this is non optimal but much clearer.
2009-07-08 14:47:23 -07:00
Brian Behlendorf 15c4a8be0c Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-07 15:35:07 -07:00
Brian Behlendorf 31157f3a90 Disable zpool_relabel_disk() which requires libefi until we have it. 2009-07-07 15:26:39 -07:00
Brian Behlendorf 23e01e6cde Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-07 15:07:37 -07:00
Brian Behlendorf 24402e5c15 Drop duplicate defines 2009-07-07 14:58:56 -07:00
Brian Behlendorf c35e61eea2 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-07 14:50:41 -07:00
Brian Behlendorf 04aa3d5ef9 Header aclutils.h only needed by idmap. 2009-07-07 14:41:19 -07:00
Brian Behlendorf 678b02cd8e Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-07 14:32:59 -07:00
Brian Behlendorf daebbab116 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-07 14:31:41 -07:00
Brian Behlendorf 33804ec976 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-07 14:29:09 -07:00
Brian Behlendorf 7c76f3ce22 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-07 14:28:18 -07:00
Brian Behlendorf 3ad5361df2 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 14:28:14 -07:00
Brian Behlendorf ba97ae2628 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-07-07 14:28:13 -07:00
Brian Behlendorf ed3bd6f446 Merge branch 'fix-acl' into refs/top-bases/fix-branch 2009-07-07 14:19:35 -07:00
Brian Behlendorf 798cf63309 New topic branch for minor acl related fixes 2009-07-07 14:18:47 -07:00
Brian Behlendorf 81729c2c73 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-07 14:14:24 -07:00
Brian Behlendorf e945eb4fe1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-07 14:13:02 -07:00
Brian Behlendorf 02bc7929d4 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-07 14:08:22 -07:00
Brian Behlendorf 1ff9c70da3 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzfs/libzfs_dataset.c
2009-07-07 14:04:47 -07:00
Brian Behlendorf 34422f0ffa Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 13:50:32 -07:00
Brian Behlendorf 47502cd94b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-07 13:50:31 -07:00
Brian Behlendorf fb26df15c8 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-07-07 13:50:30 -07:00
Brian Behlendorf cad9fa40e1 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-07-07 13:50:29 -07:00
Brian Behlendorf a2423197e1 Resolve missing cast warning 2009-07-07 13:41:51 -07:00
Brian Behlendorf 361e0e7685 Fix newly introduced missing braces warnings for gcc. 2009-07-07 13:40:16 -07:00
Brian Behlendorf ee92267c38 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-07 13:20:40 -07:00
Brian Behlendorf 9661d38088 Add topic branch to conditionally remove idmap support. The
only things currently like this on linux appears in the nfs v4
implementation of idmap.  For now we can do with out.
2009-07-07 13:16:24 -07:00
Brian Behlendorf 70804727b1 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-07 10:15:04 -07:00
Brian Behlendorf 5ae3e75ace Wrap new sysevent includes in HAVE_SYSEVENT ifdef 2009-07-07 10:07:23 -07:00
Brian Behlendorf 409cfe5051 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
Conflicts:

	lib/libzfs/libzfs_pool.c
2009-07-06 15:05:47 -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 053043b2d0 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
Conflicts:

	lib/libzfs/libzfs_pool.c
2009-07-06 13:44:19 -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 658459249e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-06 13:17:28 -07:00
Brian Behlendorf cd098f87c8 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Conflicts:

	cmd/ztest/ztest.c
2009-07-06 13:16:29 -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 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 480b03791d Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
Conflicts:

	lib/libzfs/libzfs_dataset.c
2009-07-02 17:07:52 -07:00
Brian Behlendorf b095bf444a Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
Conflicts:

	cmd/zfs/zfs_main.c
	lib/libzfs/libzfs_dataset.c
2009-07-02 16:50:53 -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 f2d80ee1f5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-01 12:57:32 -07:00
Brian Behlendorf 255ef81e33 Fix 'make dist' on powerpc64 by include an atomic.S place holder file.
Add EXTRA_DIST atomic.c for powerpc64 to ensure source is packaged.
2009-07-01 12:49:10 -07:00
Brian Behlendorf 5974d1d85e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-01 11:36:21 -07:00
Brian Behlendorf 63845164a6 Use $(RM) macro to ensure -f is passed.
Preserve path for installed headers with nobase.
2009-07-01 11:31:47 -07:00
Brian Behlendorf 685b7d85d3 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-01 11:11:34 -07:00