Commit Graph

1152 Commits

Author SHA1 Message Date
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 c3efeee12a Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-07 14:32:08 -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 acf9b98673 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-07 14:13:30 -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 ab16fdc9ad Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-06 15:09:10 -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 e320858042 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-07-06 13:12:54 -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 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 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 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 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
Brian Behlendorf d959a6177a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-01 11:11:20 -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 95ab1a0980 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-01 11:09:59 -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 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 727764d7a3 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-06-08 16:30:13 -07:00
Brian Behlendorf 3f3cebdcda libspl support for conditional SUBDIRs based on target arch 2009-06-08 16:10:12 -07:00
Brian Behlendorf bf426953af Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-05-22 16:38:30 -07:00
Brian Behlendorf 2486dd20e5 Set LP64 for powerpc64 and LP32 for just powerpc. 2009-05-22 16:27:59 -07:00
Brian Behlendorf 8bb2e455fb Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-05-22 15:07:27 -07:00
Brian Behlendorf b83a638936 Powerpc64 Compatibility
- Add 64-bit user space atomic support obtained from an old version
  of OpenSolaris which supported ppc.  They are not all 100% fully
  implemented by they are a good first step.
- Add powerpc ISA type.
- Strip out unused ISA defines to prevent any confusion.
2009-05-22 15:00:19 -07:00
Brian Behlendorf 37c55dde9f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-19 21:11:46 -07:00
Brian Behlendorf a676a29d25 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 21:11:25 -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 0bdc8e0aec Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-19 21:06:46 -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 54b5b41a58 Add 'feature-pthreads' branch to features branch. 2009-03-19 20:49:52 -07:00
Brian Behlendorf 6af4495583 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-19 19:57:36 -07:00
Brian Behlendorf 240445807b Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-19 19:57:13 -07:00
Brian Behlendorf dabea57f25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-19 19:55:49 -07:00
Brian Behlendorf bd2293fdb1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-19 19:55:03 -07:00
Brian Behlendorf 5e5d31f105 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:52:21 -07:00
Brian Behlendorf 8c43ad3853 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-19 19:49:56 -07:00
Brian Behlendorf 8cdcf1ef44 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-19 19:49:55 -07:00
Brian Behlendorf 05cec154f5 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-03-19 19:49:53 -07:00
Brian Behlendorf 53db4c7b29 Revert fix-pthreads moving to feature-pthreads branch 2009-03-19 19:43:09 -07:00
Brian Behlendorf 6ca96b06b4 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-18 13:03:00 -07:00
Brian Behlendorf cc4fbf2c35 Revert to previous behavior zdb fails when unable to open /dev/zfs.
For the moment I have added an error message to the failure path to
make it clear what happened.  I have also changed the zdb ASSERT to
a VERIFY so we always catch the failure.  For now we will just always
ensure the module stack is loaded, longer term we need something a
little more flexible.
2009-03-18 12:48:54 -07:00
Brian Behlendorf 9ce6adee54 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-17 16:07:04 -07:00
Brian Behlendorf 085d04563d Add stub header which is missing in new versions of glibc 2009-03-17 15:53:34 -07:00
Brian Behlendorf 57defb44e4 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-16 16:22:34 -07:00
Brian Behlendorf 1997a1de19 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-16 16:22:04 -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 85f5512989 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-16 16:19:03 -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 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 ac0ed2b141 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-16 10:42:55 -07:00
Brian Behlendorf 10e245f03f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
Conflicts:
	cmd/zpool/zpool_main.c
2009-03-16 10:42:20 -07:00
Brian Behlendorf 6bd672012f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-16 10:39:56 -07:00
Brian Behlendorf e98228ab73 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-16 10:39:08 -07:00
Brian Behlendorf c9cff73d9e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
	cmd/zpool/zpool_main.c
2009-03-16 10:32:12 -07:00
Brian Behlendorf be112b3f57 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-16 10:30:31 -07:00
Brian Behlendorf 5ee8a85ba6 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-16 10:30:27 -07:00
Brian Behlendorf 9818e69640 Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2009-03-16 10:12:01 -07:00
Brian Behlendorf 2924858552 Remove two self referential functions.
Newer versions of gcc (4.3.0) detected the following unused
code segments.
2009-03-16 10:02:06 -07:00
Brian Behlendorf adaf659f27 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-13 09:51:37 -07:00
Brian Behlendorf caba3cb67e Update specific asm-* arch to generic i386.
Depending on your x86 architecture $target_cpu can evaluate to
any of the following (i386|i486|i586|i686).  Since our local asm
uses only i386 instructions sed is used to map all of these to
i386 and sets $target_arch.  Other arch's are not impacted.
2009-03-13 09:41:55 -07:00
Brian Behlendorf 640eb1d542 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 15:47:07 -07:00
Brian Behlendorf c399ce1af8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 15:46:45 -07:00
Brian Behlendorf c6c2cf2b51 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 15:45:29 -07:00
Brian Behlendorf 9e4850e3d1 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 15:44:54 -07:00
Brian Behlendorf 5a7e7e9d3b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 15:44:18 -07:00
Brian Behlendorf 82ce8b00f3 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 15:44:14 -07:00
Brian Behlendorf 6a5acaa105 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-12 15:44:13 -07:00
Brian Behlendorf 9fe5b916e2 Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch 2009-03-12 15:39:27 -07:00
Brian Behlendorf 9e49df6b20 Add gcc-fortify-source branch 2009-03-12 15:38:51 -07:00
Brian Behlendorf 574ed0e0b7 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 15:29:01 -07:00
Brian Behlendorf a5326d0d28 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 15:28:42 -07:00
Brian Behlendorf cc0c97146c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 15:27:28 -07:00
Brian Behlendorf d830f4bf24 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 15:26:54 -07:00
Brian Behlendorf d66ce12199 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 15:26:18 -07:00
Brian Behlendorf 379d9cf34d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 15:26:15 -07:00
Brian Behlendorf 6a59551cb7 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-12 15:26:13 -07:00
Brian Behlendorf c4e10eb3df Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2009-03-12 15:21:30 -07:00
Brian Behlendorf f1f9c50dd9 Add fix-strncat branch which corrects a buffer overrun. 2009-03-12 15:20:26 -07:00
Brian Behlendorf 4e4fbfe52c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-12 15:15:10 -07:00
Brian Behlendorf 0a6d02c2b9 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 15:15:08 -07:00
Brian Behlendorf cd52c92666 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 15:14:46 -07:00
Brian Behlendorf 224d1bc012 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-12 15:13:35 -07:00
Brian Behlendorf 74a134347a Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 15:13:02 -07:00
Brian Behlendorf 35b117277d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 15:12:26 -07:00
Brian Behlendorf f2e7d57653 Packaging update
Make LINUX_VERSION available to Makefile's, add packaging
for user space include headers.
2009-03-12 15:07:29 -07:00
Brian Behlendorf 59541a305e Libspl XDR implementation reorganization
Moved xdr_control() function from static inline in xdr.h in to a
new xdr.c file which was added to the libspl build.  Additionally,
I have removed the 'xdr_bytesrec' typedef which shares the same
name as the struct.  This is what Solaris does, but it's just asking
for trouble.  It has been replaced with an 'xdr_bytesrec_t' typedef.
2009-03-12 14:38:52 -07:00
Brian Behlendorf 3d35752b2b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 10:40:32 -07:00
Brian Behlendorf fbbb5fe669 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 10:40:09 -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 45f3d2a2a4 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 10:38:05 -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 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 df8e13b5bd Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-12 10:03:02 -07:00
Brian Behlendorf 77695eacc1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 10:02:45 -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 dcc25c44da Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 10:00:48 -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 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 53b7082303 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-03-11 22:28:01 -07:00
Brian Behlendorf 426ed71564 Pull unused function under HAVE_LIBEFI ifdef. 2009-03-11 22:17:38 -07:00
Brian Behlendorf da324afb34 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-11 21:02:49 -07:00
Brian Behlendorf b392fd33fd Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 21:02:27 -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 9c4cc2ae78 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 21:00:25 -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 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 2ba55e86c5 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-11 14:58:34 -07:00
Ricardo M. Correia db42bfe00a Fixed compilation error due to missing xdr_control() implementation in Linux. 2009-03-11 14:53:41 -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 962c862580 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-11 14:13:07 -07:00
Brian Behlendorf 330dbde81a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 14:12:39 -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 ab760deda7 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-11 14:10:39 -07:00
Brian Behlendorf cac68bc478 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 14:09:49 -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 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 d57bb8312d Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-11 12:22:30 -07:00
Brian Behlendorf 84b63f7730 Remove all #pragma idents from libspl. 2009-03-11 12:13:44 -07:00
Brian Behlendorf 3a23753b70 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-11 11:20:30 -07:00
Brian Behlendorf 261ca2beb9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 11:19:58 -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 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 47e0037a8b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 11:15:59 -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 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 0c8622c47c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-11 10:55:05 -07:00
Ricardo M. Correia 4a118b6227 Minor bug fix due to MAXOFFSET_T constant being too large on 32-bit systems. 2009-03-11 10:47:20 -07:00
Brian Behlendorf 2d37cf7361 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-10 22:03:01 -07:00
Brian Behlendorf c05c1aa6f9 Build system and packaging (RPM support) (Part 4)
Complete support for dist install srpm and rpm make targets.
2009-03-10 21:57:56 -07:00
Brian Behlendorf 7ca5d85ab6 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-10 21:30:24 -07:00
Brian Behlendorf 171086af52 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-10 21:28:53 -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 e610bf6e09 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-10 21:26:59 -07:00
Brian Behlendorf 64c77b5cdb Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-10 21:26:14 -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 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 da2df72c28 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-02-18 16:06:49 -08:00
Brian Behlendorf 2cd31b723e Add HW_HOSTID_LEN for libspl use 2009-02-18 16:00:50 -08:00
Brian Behlendorf 5164741b40 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-02-18 15:23:29 -08:00
Brian Behlendorf a6fbd61ff1 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-02-18 15:23:07 -08:00
Brian Behlendorf 03f8c8f94b Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-02-18 15:22:04 -08:00
Brian Behlendorf b878be0ee1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-02-18 15:21:35 -08:00
Brian Behlendorf e77f9a10a9 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-02-18 15:20:53 -08:00
Brian Behlendorf e60db6f9dd Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-18 15:20:14 -08:00